You might also think about adding a relay to your headlight system. The power to the headlight goes through the dimmer switch, so poor contacts there can cause high resistance. Eastern Beaver sells several pre-made kits for making the upgrade, his stuff is top notch if you aren't skilled with terminating wires and such. https://www.easternbeaver.com/Main/Wiring_Kits/H4_Kits/h4_kits.html
So how about a 18K RpM light bulb?!