I wouldn't say I was 'in the poo'. I have a solution that works, and if it didn't it is within in my skillset to put the switches I took off back on (although I did have to change the back box from a single to a double but that just means buying a new faceplate!).
But yes I agree fully, rewiring...