Have either of you considered buying a pre-made, aftermarket wiring harness? They are available for all sorts of applications with multiple circuit quantities too.
Some of the manufacturers are Painless Wiring, Centech, Ron Francis.
These kits make life easy and are worth the $$ savings in just headache prevention.