I think if I were replumbing I would put point-of-use or instant POU water heater at various points. I take what I think they call "military showers" hate the name but it is -
turn on the water, get wet, water off, shampoo, water on rinse, water off, lather, water on rinse, use hose to rinse...