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 down shower walls. water off.
Kitchen sink-the smallest 110volt or similar OR 2.5 gallon w.h. under sink. If I were using the 2.5 gal. I would have it on a timer or have a wall switch. Maybe use the outlet for the garbage disposal.
Bathroom sink- a 1 gallon POU or small instant w.h. no switch.
Bathtub- a 20 gallon with switch and or timer OR a heated showerhead OR a POU instant 220 volt.
Washer- This is great, Because the front loaders are so efficient one could easily tap off either sink or also give it a separate POU instant
The other thing about standing tanks is that the heat they waste comes into the room. if it comes into the rooms, in warm weather, you have more to cool. Thus wasting more energy. I have found in more than one instance where a utility room with a boiler or water heater is much hotter than the rest of the house.
POU options would elimate that.
So you would save in other areas beside water heating.
You can also gain floor space.