Just going back to the initial problem. This is not a new circuit, this is an existing installation where the intention was to replace the old wiring and sockets like for like, and if possible, add RCD protection and an external socket.
By the sounds of it I think the easiest and most compliant...