Make sure the starter relay under the tank is plugged in good and the contacts are clean. If this connector is loose or corroded, it can kill both the headlight and the starter. The relay itself is probably OK, as it would either kill the headlight only when you push the start button and not pull in the solenoid or just not do anything and leave the headlight on.
