Will Pokemon games ever go back to giving rivals 5-6 Pokemon and Gym Leaders more than 2 or fucking 3?

Same with normal trainers. There used to be a lot of trainers who had 4+ Pokemon but in X/Y they have 3 at most, and 90% of them only have 2.