There does appear to be still some confusion regarding the provision of RCD protection for socket-outlets.RCD protection should be provided for socket-outlets with a rated current not exceeding 20A that are for use by ordinary persons and are intended for general use, and mobile equipment with a current rating not exceeding 32A for use outdoors.
Any socket-outlet provided for a specific purpose such as to connect a fridge, freezer, boiler, cooker, washing machine, dishwasher, waste disposal, TV distribution system etc. and is not intended for general use, does not require RCD protection. You could even argue, that a socket-outlet next to a TV ariel socket is intended for a TV, and that it also does not require RCD protection.
Where socket-outlets are required to have RCD protection, there is no requirement for the RCD to be installed in the CU. Obviously it is easier, and more cost efficient to install an RCD to protect all of the socket-outlets on a circuit, rather than install a number of individual RCD socket-outlets.
Another requirement for RCD protection, is where cables are concealled in walls at a depth less than 50mm. Once again there is no requirement to install the RCD in the CU. The RCD could be installed where the cables physically enter the wall.
There is to my mind, only one requirement where RCD protection should be installed in the CU, and that is to protect circuits of special locations. Although a number of people argue against this.
There appears to be two schools of thought regarding alterations and additions.
One is that when making an alteration or addition to an existing circuit, the whole circuit must then be upgraded to the current Regulations. Although there is no Regulation requiring this.
The other school of thought, is that only the work conducted for the alteration or addition is required to meet the current Regulations, and any defects in the existing installation be noted in the comments box on the Certificate. As required by Regulation 633.2.
As far as the OP's stated intentions, I would as has already been pointed out, install a 40A RCBO for the shower and place the lights either on the RCD protected side, or use RCBOs (especially the light circuit that feeds the bathroom). I would then make notes on the EIC about any circuits that do not comply with the current Regulations, but only where it is reasonably practicable to determine that those circuits do not comply.