Creating a new Headlight circuit

[swansen]

essentially i am looking to do this exactly, use the existing headlights/lamp socket but replace everything else. One of the leads has some odd resistance and on the the switches keeps killing the low beams, i just want to defeat the entire system.

however

i am not sure how to run the circuit and the ground for the lights would normally be through the switch itself, not on the actual bulb/socket/etc. so this is where my confusion comes from.

imagine this circuit here using the dual filament bulbs shown only instead of going to the existing harness, it would run my own leads for a switch and signal power.