I can haz warm water?

[pne]

Apparently, the water heater at the top was fine all along -- it had just tripped the emergency low water thingy that prevented it from running dry.

When the electrician came to install the new heater, they opened the old one, found what had happened, and reset the thingy and apparently it works again.

So the one in the cellar is still on the fritz but that's not the primary shower anyway. And we should have warm water again now! And saved the money for a new heater!