Exactly. They still loved each other very much and that wasn't changed in the end.
I love that Joss knew that. It's just not possible to only love one person your whole life. It just isn't. And he never pretended relationships didn't happen either.
It's why Joss wrote one of the best tv shows in existance