Ah well, After much tea slurping and a fair bit of muttering, the task is done. Filing off the locating lug on the switch unit proved very helpful.

If it goes again I'll look at the relay option.