You can use back the storage heater. But need a bigger capacity.
Minimum is 50l according to Joven recommended.
What I suspect your heater dryburn is because the capacity is not enough. Here is the probably scenario,
1) when the heater is new, there is not much problem with it as the water boiled fast enough. So your usage of hot water is lesser cause mix with cold water more. The draining of the hot water is slow down.
2) once the heater getting old or insulated with the mineral deposit, the water getting slow to heat up. So you have to use more hot water to mix. Consumption is high till the incoming is not fast enough to replace the out going. That is when the heater not submerge inside the water that cause it dry burn.
Normally storage heater have such a safety device built in.
1) pressure release valve to not over pressure the tank.
2) temperature cut off when reach the target temperature. Heater will off.
3) Thermal relay to avoid dry burn the heater. If the heater not submerge, heater temperature rise very fast and take alot of current. This thermal relay will cut off the heater supply when certain current range reach. Thermal relay will get hot and open the contact. No power to heater. Once the thermal relay cold down, the contact will close again.
So there is a possibility that the protect Thermal relay is not working. If the existing model don't have such function, than better change the heater.
If you want to change the storage heater,
1) change to bigger size. Minimum 50l.
2) Change the way you ON the heater. ON the heater earlier. OFF it when you take bath. Before when to sleep, ON the heater back. Just OFF it everytime you take bath. In this way, water have the time to fill back. Hot water can be keep very long in the heater. And for safety too.
3) For additional safety, install a RCD after the ON/OFF switch. Change the out going piping to non metal contact type. Poly pipe for example. (Just a short piping before the existing pipe disappear into the concrete.)
The short part of non conductive piping must be longer than 1 meter.
This is for the distance of water to increase the total resistance against current so that the current can do no harm to the person.