Exactly. As long as they're safe and happy, that's all that really matters.

[ Which might seem a bit counterintuitive with all the battling, but some of the Pokemon still liked doing it, so? ]

It can be, yeah. I had a Pokemon that stopped wanting to train after a while because he didn't want to evolve. But there are some special stones that they can have that will keep them from evolving, no matter how strong they get. He has one of those now, so he enjoys training again.