I've had fitted an alpha cb50 for exactly those reasons and it fits the
bill perfectly

Shower will take your skin off, and bath fills v quickly with
scaldingly hot water (you can of course turn the thermostat down)

only drawback of converting from the old HW cylinder was that the new
pressurised system found lots of tiny leaks in the old radiators - so
I'm gradually replacing them

John