I'd say lose T-bolt on Jirachi for S-ball,you already have T-bolt on Gengar which is actually a better square off against Gyarados and Feraligatr as Gengar has Levitate it gets round EQ ;).
Side note G-dos and Gatr don't always have EQ but nevertheless,Gengar gets round EQ full stop.