Thanks sparx for responce am relieved system is ok, assume I can change the double switch socket for an RCD type myself.
Re the plug-in MCB's guess these will project further away from the CU and existing cover will not fit, is that ok.
Thanks again.