Well, I don't really see the difference
To Level up you're going to need to battle, like it or not unless you have an endless supply of Rare Candy. Levelling up is one of the ways to increase happiness (Ranges from +2 to +6 depending on level), and that is done through battling normally. Soo.... both? :P
The point is, as long as you level up your Pokemon will gain happiness.