Hey dude how have you been?
Anyways this seems like a pretty good team so far. Regarding your dilema i would personally choose Magnezone over Jolteon for this team.
Also for your T-Tar problem maybe a Dugtrio with a good set could be the answer. it takes care of Rachi also which means you have...