By the way, who did this swap? You've had so many problems with this you might as well take the whole thing out and start again fresh with the wiring and everything.