You got a point and come to think of it, I think 15 and 25 is too much unless you really want give that many Pokemon to Champion ^^
How about Champion gets to pick 6(if not double it) when he become champion and get additional 6(or double it your choice) everytime he defend the title?
And challenger who beat champion will gets 6(or double) too, what do you think? ^^