Thanks for the help. I've changed Zapdos to a bulkier sub set, although I better keep heat wave in there as that's why I needed it.
I'll consider using Salamence for that slot then. Or would extremeSpeed Nite be better?
What do you think about the Swampert moveset?
Would Starmie be any use in Gengars place? I have no rapid spinner and that would still help with the Nape problem.