Personally I would just keep the existing storage heater.. if not problem, why wanna waste money

I used to use storage heater at my old apartment, better water pressure than instant heaters which i'm using at my new apartment. Zzzz..

the best is when I lived with my parents.. storage heat + pump.. awesome time in shower lol