I would make the main switch(top right) double pole, by taking the existing neutral to it, and adding a neutral tail to the CU.
Remove the existing Main switch from the CU and replace with a 63A/30mA rcd, get a 17th edition conversion kit for the CU, add another
RCD, and neutral bar, and the...