There are tankless models now that never run out of hot. Only downside is the first half second always seems to be cold as it’s just past the heating element.