I bet there will be a contest in Celadon too, it's a big place. I was thinking about and since Ash has really grown as a trainer, and the way he handles battling now, Primeape could really fit in with him. Also, it's one of the pokemon he didn't officially give away.
This saga should be interesting, I think people are getting used to the idea and aren't as opposed to it as they were. There is a chance for many characters to be reshown.