Would love the gems to come back, the more possibilities the more fun
Though there's merits to keeping it simple (easier for players, and easier for devs to keep track presumably), and include the latest available "version" of each species of Pokémon from the main line games.