Finally did what I’ve been threatening and moved this switch, from picture one to picture two. Didn’t even need to re-wire anything , just unplugged the loom and fed it through a different route without making any holes other than the one in the wardrobe wall to fit the switch