Thanks, that looks like a good clear guide to follow.
Anyone want to sell me 18 AWG or better (preferably 16 AWG) 6-pin and 8-pin connectors? Chop them off of dead PSUs, or make them from parts from digi-key - I don't feel like crimping all those terminals, but if the price is right I'll pay someone else to do it.