Yep, sounds like things are happening.
I know what you mean about getting out of the water.
The one good thing I found about the hospital was that I could sit in the shower for hours on end (about 3 - 4 out of 5 hours in hossy) & not run out of hot water.
Maybe just keep topping up the bath.