+1 on the starter switch. Mine also had an issue when I switched from low to high beam or back. The same spray cleaner to that switch fixed it.