you're right... i honestly cant see this getting around Kingdra? i would suggest getting a different deck that could compete... any fixes i make wouldn't do much...
but add abomasnow to stall and set up a magmorter that could OHKO all the kingdras....
drop a chatot, and an unown G
with azelf you wont have to worry about it being prized, and i think a strait magmorter can handle gengar. so
-heatran line
-chatot
-unown G
add abamasnow line
and bubble coat