greetings, once you have the problem sorted and repaired I would add relays if you continue to use high-watt lighting.
you can buy the eastern beaver kit:
http://www.easternbeaver.com/ which is well made and space saving or make your own. attached photo is from my 94 1100LT, automotive relays and some larger wires to carry current from battery to light.
in the photo with relays, the yellow, white and brown (w/blue jumper) are from the factory switch/harness and provide power to relay coils through the OEM switch. The red wire (pictured) is from 12VDC source (can be battery or switched voltage), through a fuse, the relay(s) and then to headlamp. Headlamp socket/plug (pictured) is also grounded with higher capacity wire.
Lots of info on site on how to do this, pretty straight forward if you're somewhat handy.
The eastern beaver kit is "plug and play" and quite easy to install. I have one of these on my 85 100RS.
either way, higher wattage lighting will require larger gauge wire to handle the load.
g'luck