Thought I'd share what I've been doing, I've had a lot of little electrical issues recently including a dodgy rec/reg bad battery etc. The lights/indicators have never worked well and it was getting to the point where turning any of the electrical devices on would actually cause a drop in power.
The bike has spent some time outside and I suspect that corrosion on the switch contacts has contributed to this as well as 20 years of previous owners (myself included) adding various bits to the electrical system, not to mention that the way these bikes are wired the entire electrical load goes through the key switch at some point.
I wanted to add some other electronic accessories at some point in the future and figured that the best way to sort out the issues and be able to do this was to install a relay box. I picked up a second hand one from a wreckers which came of a Hyundai "something" I got one of these as it was reasonably small and it included the fuses and the relays in the same box.
Here's some of the pics of the loom before and just after ripping it out of the bike.









As you can see quite nasty, I've bought some proper loom tape to wrap it back up with which will be a good start anyway.
Here are some pics after doing all the rewiring, I've put it back in the bike to test everything before I wrap it up and cut and fiberglass the hole for the relay box.



The bench testing was extremely frustrating as nothing was working, that's when I discovered that I had a bad battery (again) it's showing 12.5v but dropping down to 9 as soon as you turn the bike on. So that's as far as I got for the day, I'll bring the car battery in tomorrow and finish up bench testing with that.
Thanks for looking.