2 Empty Spots in 2 Wi-Fi teams... Help?

I think this goes here... I'm not 100% sure...

Well, I am making 2 wifi teams. I am missing two pokemon in each team...
In my first team I have:
(I am not revealing them for my own reasons)
an annoyer, a physical wall, a special sweeper, and a spiker. I am left with two empty spots... which I am unsure what to fill them with.
in my second team I have:
an annoyer, a special wall, a physical sweeper, and a stealth rocker. Again, I am left with two empty spots...

I was thinking of filling each with a tank, but still not sure... also I may put a baton passer in there...

If you think I should throw a tank and a baton passer in each tell me, otherwise tell me what you would do.

Thanks.