design with upgrade ability to heat water is a excellent idea and
probably cheap too. leaves it as a option for the future.

it would give you faster recovery and more hot water when you want it
at a far lower cost.