Not an argument, but a different personal interpertation of the regs!!!
You have made a good decision, but if you fit a cooker switch with a socket, you still need to shift the cooker cable in the CU to the RCD side.
In any case I would put an RCD on any sockets installed on the ground floor...