I completed the Wildkat swap also. I am a bit embarrassed to admit it took me more than an hour from start to finish though. Must be the cool weather and not anything to do with my mechanical aptitude.
While in the box I also checked the factory terminations and all were tight!