Our office has a little water heater (just a few galons) under the
sink, and a cold feed. It always seems to be hot and it doesn't waste a
lot of 'hot' water as it comes along and warms up all the piping. I bet
you could get a 5 galon one and would love it.

Dean