Thanks. Good to know. So far, apart from the rusty, broken springs in the kill switch, everything is recoverable. I have ordered some 3mm OD x 10mm long springs off eBay. I actually think 1/8" OD x 3/8" long would be a better choice but I can't find any. Given that all the springs do is push copper contacts together, I think what I have ordered will be OK. Fingers crossed.Might be worth casting around for another switch to cannibalise for parts.
Quite a few different Yamaha models from that era had the same basic switch body, although the wiring was different.
All the XS250's and 400's had the same switch as well as the generally unloved XS750
I'm very grateful to the forum, yet again, for such amazing information.