That sounds right to me. Did your new motor connectors fit the old esc? What is all that white tape wrapped around the motor wires? (I'm getting worried)
I soldered new female connectors onto the ESC wires. The tape is there mainly because Castle did not heatshrink their wires particularly well and when the connectors are pushed together there is still a fair amount of the gold connector showing.
I will probably just redo their heatshrink or just neaten up the tape.
I'm also considering shortening the wires from the ESC, as I know this motor usually plugs directly into Castles ESC and it will also make things neater.