Thanks, if I can't find one over here, I will give you a shout.
The previous eBay one I got worked for a 10 min test ride, then the battery light came on and it actually turned the bike over on its own without the key in the ignition !
I paid a little more for a Yamaha one on eBay this time ( showed Yamaha part no. on the back in the pic ) but turned out to be nothing more than a £5 generic and the spades are bent sideways where the fold has been pressed at an angle !
FWIW I found the best bang for buck was the battery. I replaced the solenoid and the cables, but this was nothing compared to changing batteries. I have always used Yuasa with an optimate 4, but there is definitely manufacturing differences. I recently replaced after 7 years, massive difference in cranking speed.