I am going to be rewiring anyway, so that part doesn't worry me. Doing the MADElectrical relays and stuff. Tossing in a couple of connectors was expected.
I just wasn't sure what the best or normal way to do the headlights was. I should have been an engineer, I can overanalyze anything.