[Michael in Sedona]

I did something similar to what Jeff/Illinois did. I made a connection inside the headlight bucket while leaving all the outside parts stock. Looks original, but it solved the shorting problem.