OK, here it is:

Battery feed side, from left to right:
Horn terminal - green w/red tracer
Ign sw coil - dark blue w/white tracer from ballast
Batt feed - empty
Ign sw B+ - red wire from ignition switch
Stop sw B+ - pink wire to brake switch
Alt batt post - black wire from alternator
Haz sw B+ - pink wire to directional signal plug
Light sw B+ - black w/white tracer and pink, both to headlight switch plug
Dash B+ - black wire to voltage limiter in cluster plug
Radio B+ - to radio plug

Acc side, from left to right:
Horn sw - black w/white tracer to directional switch plug
Wiper B+ - to wiper plug
Coil/Dist - dark blue w/white tracer out to ballast
Dome light B+ - to plug for rear harness
El fan B+ - empty
AC/Heat - black w/white tracer out to fan controls
Alt ign B+ - empty
Ign sw accy - black from ignition switch plug
Turn sw B+ - red w/white tracer o directional switch plug

I'm sure I have some of these incorrect, so please advise your opinion so I can make the proper changes. I think that I may have the ballast wires incorrect, and I will also change the power to the light switch as you had previously suggested.

Thanks!!!