Why not place coils that get hot around the spout or the entire faucet that heat up the water the instant you want HOT water?
It seems like having a huge tank of water heated by gas or electric, would be more dangerous and expensive than having a relatively small coil to heat the water as needed. It would be like when you have dimming lights, except the energy would convert to heat not light.
Discussion
Related Ideas