Seconding Matthew for the Dragon leader...if we have one. How many non-Legend Dragons do we have?

...And in that line, we also need to think about how many 'mons we have of each type. It would be kind of hard to do a late-game Gym with a type that only had 5-ish different ones in the C-K Dex.

Also, we could go with Clara for the Ghost one. Similar enough to "clairvoyant", but different enough from Johto's Clair.