Mark-no, the downstairs switch is in a single storey rear extension, no upstairs socket above that! Yes I have a cable detector, will try that, didn't think it would work though floorboards.
ban-sorry, I meant to say 32A. Yes, switch cable is all 1.5mm. Yes, sure both sockets are on the ring...