Help needed on picking the last 2 members of my team

[Cohacq]

I'm in the process of building myself a decent team (I wont train EVs so it doesn't fit in competitive), but him having problems with the last 2 slots.

Here is my team so far:

Crustle
Stealth Rock
X-Scissor
Stone Edge
Spikes

Excadrill
Rapid Spin
Rock Slide
Earthquake
Swords Dance

Cryogonal
Ice Beam
Confuse Ray
Recover
Night Slash

Gallade
Night Slash
Swords Dance
Psycho Cut
Close Combat

------
Now, I have 2 variations

Version 1:

Starmie
Rain Dance
Thunder
Psychic
Surf

Haxorous
Taunt
Swords Dance
Outrage
Brick Break

Version 2:

Volcarona
Quiver Dance
Bug Buzz
Fire Dance
Fly

Carracosta
Crunch
Shell Smash
Aqua Tail
Rock Slide


Version 1 has more coverage (I really need electric as I have no counter to water pokemon which take out Exca with no problems at all), but fire is awesome as usual.

So... any opinions?