Last night [Wednesday] I decided to have a go at the ignition switch. I am sure it is not wired up correctly. First I checked I had the right number and colour of wires. I did. I took the ignition switch off the bike and checked the numbers of the tags against the wiring diagram. The numbers of the tags did not tally. I used the electric meter to try to work out which tags did what. I figured out where the red wire, power, and the grey/black wire, parking lights went. Then I just had three tags and two green wires to hook up. By a process of trial and error I found the homes for the wires. When complete I was able to have the parking lights on, which allows the key to come out of the off the switch. At full on the key is locked into the switch and all the lights and ignition circuits. The brakes lights respond to the levers. I refitted the switch and bedded own the wires into the headlight shell.
I figured out what the rest of the free wires were in the head lamp shell. I have to find the proper feeds for the auxiliary instruments. It also looks like one or more bulbs in the speed/rev pod have blown.
Thursday night I had a go at the clutch cut-out switch. I had to remove the clutch lever to get at the screw that held on the switch. Once the screw was out it was simple job to replace the switch and re-assemble the clutch lever unit. I capped off the unused wires in the headlight shell and tucked them out of the way.
I had recently bought the parking light holder and bulb. I had to use a little foil the make the holder a snug fit in the head light reflector. I fitted a spade connector to the correct switched power wire and connected it up. The earth wire took a bit of routing but I got a good connection. I taped the parking light wires to the headlight wire set to make it neat. The wiring in the headlight shell is very crowded.