Another suspect point may be the thermal contacts in the headlight switch.
don