I had the same problem before. I replaced the headlight switch and been fine since!
Darren