Headlight switch , is it the cause? or the curse?

Get the headlight load off the switch by using a relay kit. Improves headlight perform as well.