On your signals: It sounds like your left signal is not connected to the circuit that has the flasher unit in it. On your headlight circuit :Apples and Oranges maybe but my 83 sporty had a Yellow wire , a White wire (High/Low beam ) and black for ground, if I remember right.
I will be doing the same thing you are eventually. I remember changing a burned-out headlight and being absolutely fucking amazed at how much SHIT was stuffed inside the headlight bucket. Sounds like you just about got it though.