You found a good work around. To repair it, I would remove the switch to see if you loose power to the switch when the headlights are turned on. I haven't looked at a diagram for the switch, but since the taillights work, the power supply may not be a issue. I don't know if the headlights and...