Factory terminals to re-pin connectors?

If you want sockets that will fit on the circuit board pins, use Molex .093 sockets. P/N 02-09-1119 for 18-22 awg wire and 02-09-1104 for 14-20 awg wire. They are available from Mouser or Digi-key. They have about a good retention force, so if you tyrap the wires together, they will hold just as well as the OEM connectors.

Ah, that's a nice substitution. I didn't think about those. I've built computers for years and am used to seeing them on power connectors. That would probably be just about right.