The Start button has a second set of contacts that turns off the headlight while the starter motor is running. I suspect that may be the cause of your problems so disassembling & cleaning the button and fixing whatever is preventing it from working properly will also fix the headlight issue.
