I went with a tankless water heater, for flexibility and because it would take up somewhat less space. I got a Gasland BE158L off Amazon, as one does.
I installed it in the wall between the bathroom and kitchen, this way the most frequently used hot taps are extremely close to the heater.
First, unsure of how hot the whole unit might get, I heat shielded the mounting area with aluminum sheeting.
Easily mounted with slotted holes at the top and a couple of screws at the bottom. I tested it for a while:
Exhaust was a problem. I didn't want to put a hole in the roof for a chimney, but exiting through the wall would require angling the vent tube downward, not great.
In the end, I reasoned that the only time the heater would run for extended periods is during showers, and there's always a ceiling vent fan running during those, so I just have the heater venting near the ceiling. It works fine.