I have only one Pokémon that can learn dice and waterfall, my Greninja. I need to keep other moves on him and as such, I constantly have to swap dive and waterfall with each other. Is there a better way to go about this without getting another Pokémon in my team?