Challenge is a consistent thing, now make a godfather impossible is another. Aside from the fact of having to take two water-type pokémon, 2 wrestlers and 2 dark, ends up with any strategy to defeat him. If you do well, the player has just limited to certain Pokemon, that won't make any sense together or even have her as "strategy" that was spoken by the Shemac.
I think you should revise it. I think it was quite unfair, because whoever did before the exchange benefited and the other player who were to face the same and get the reward of the third victory over he will not win, because it was changed.