Thanks both! Yeah the switches came up on eBay at a good price so it seemed silly not to. This turned out to not be entirely true... I was only getting power to the brake light switch when I had the other lights on. Solved pretty easily by separating two wires that were joined together on the CBR setup. I had wondered why everything still seemed to be working with 1 less wire than the original but now I know! I spent the rest of day finishing off the wiring fitting newly repainted indicators and put the clocks on the bike. As everything is now done at the back of the bike I've loosely fitted the tail fairing. Sadly the fairings are pretty beaten in places and are going to let the overall finish of the bike down, I think at some point I'll have to shell out and have them properly repaired and repainted. For now I'm going to try my best to repair what I can - fairing repair tips welcomed!