Heh. I was totally thinking of the moves as they are after the split. My bad. ^_^;.
Since that's really what I intended, I'll let you run with it. So just avoid learning any moves that are special NOW. Basically, no Surf, Water Pulse, Ice Beam, Blizzard, Hyper Beam, etc. Hopefully...