In my house the immersion heater switch in kitchen and the FCU in airing cupboard were years ago both changed to sockets. Father-in-law the supply works the solar panels on the roof, it has been a problem, as still marked immersion heater and panels have been turned off in error, then they needed topping up again.
I needed the room so no real option, but today I would think twice before removing cistern, it costs so much to replace and time after time I have seen where it needs replacing to use solar panels. However once removed may as well fit sockets, as to what type, and what to do about lack of RCD protection that is for you to decide. Be it RCD sockets, RCBO in consumer unit, or another method, could be a RCD FCU in kitchen for example.
I have three electric showers in this house, two not connected since rewire, non used, once my wife used the wet room with a shower from combi boiler the electric was never used again. There is a problem with combi boiler, it has an Eco button, Eco on and kitchen taps don't use enough water to turn on the boiler, Eco off and the shower gets warm then goes cold then warm again as it uses up the reserve in the boiler.