Do you check Smogon competitive builds?
http://www.smogon.com/bw/pokemon/infernape
Id take Flare Blitz, Close combat, mach punch and thunder punch on him. Recoil isn't so bad, he's a glass powerhouse and you can switch out + potion if needed.
You can get Thunderwave on Togekiss by breeding it with a male minun/plusle who learns it leveling up. You can also teach it nasty plot via them too so you wouldn't need to baton pass with Ambi and could build ambi the way it should be - Technician + fake out + u turn.
http://www.pokemonreborn.com/forum/index.php?showtopic=4886
There's a great thread on how to breed useful support moves onto your vaporeon. Hydro pump > Muddy water too. 5% less acc for 25 more power.
Annnd, Id recommend getting sludge bomb on your gengar which you can do by breeding it with a grimer/muk.