Do you play with Set Battle Style? It doesn't let you switch after fainting an enemy Pokemon, and requires you to be more careful with your team design and switches.
I didn't mind XY being easy; my issues are the poor story, which is a huge step down from the deeper-than-usual story of BW, and the barren post game. I view the single player mode as the stuff you finish to reach the real game - post-game battle facilities, catching 'em all, and multiplayer battling - so the low difficulty was not a concern of mine.