Yes I'm considering what u said and I am Going to take out Gyarados and Scizor and add Starmie +?. 4 with 4x damage might be too much. but also they cover each others pretty easily. Swampert switch with scizor for grass etc.
I understand about Jolteon, Ill change it asap. Why would I use Fire...