[mattybucks]

I agree re wiring, wire it once correctly and then forget it. I use 4mm bullet connectors and wire directly to the motor. The less "joins" the better.

I'm sure someone at your local club could help with the soldering.