Alright... I got it working pretty well. Seems the problem was that the motor wasn't sitting in far enough. Wasn't the wires though, they were sitting where they needed to. The solution that worked in the end was to put a touch of lubricant on the sides of the motor... not too much, just enough to let it slide down easier. Good as new!
