Nothing wrong with those options. Just me being dense I guess!

The only online quote I've got so far is via 247spares.co.uk - some place asking £24 just for the switch. I'm a bit surprised by that - I'm rather hoping there far better prices to be had out there.

I'm still stuck with this switch connector that won't budge though...