Thanks for that.
Just tried getting to the connection but it seems to be tucked behind a bulk of other wires. Am I right in thinking the tank may have to come off to get at it?

Regarding the side stand; I don't actually have a stand attached to the switch (center stand only), so it should be closed all the time and won't have the affect of a moving side stand against it. And the neutral switch behaves fine, no flickering or false lights.

I've just taken the switch out, given it a good clean and few squirts of WD40. Bike behaves as normal again now. Will see if that has sorted it - or just coincidence since it's intermittent anyway.

__________________