Yeah i had a look at that lot but mine looked fine.
I think it is a mechanical fault with the switch rather than an electrical problem with the wiring loom. I cleaned and greased the connections anyway just to be sure.
Looking at the workshop manual I think I wil have to drain the oil to replace the switch and it also looks like I will have to remove the side stand to get access to the thing as well.
small fault turning into a bigger job - that yamaha should be doing!