Don't worry - the latest change reverts the Drain Punch changes. The Rotom formes already receive a secondary move (H: Heat Wave, F: Frost Breath, C: Magical Leaf, S: Hurricane, W: BubbleBeam). I guess I could give them another one... Rotom-F with Milk Drink sounds so wonderful and flavorful, I really like this idea. Katakiri, that's a very good idea. Thematically, Keen Eye doesn't really suggest that sort of mechanic, though, and a lot of already-strong pokemon get Unnerve. Maybe it would make sense for a different ability... White Smoke?