Well you all have convinced me after looking at the mass of unlabled wires one last time. I have gotten so frustrated with my lack of progress with the wiring I'm going to cut out what I have one order a purpose built harness. Most likely from EZ2wire. I like their philosophy and the products look pretty good.
I'll be calling them today to get my final questions answered and placing my order.