If you're going to start using the Molex connector pins, go ahead and buy a pin removal tool from an industrial electronics type of place like Ralph's.
It makes life much easier, about $10. I got mine back when I was doing the electrosport high output stator project on my 640.
This tool is hollow and spring loaded and allows you to remove the male or female pins from their sockets very easily without destroying the connector blocks the sockets, or the wiring. It's makes it much easier if you need to change pin/wiring placement in the blocks.
No, really, the mustache means I love you.