insuranceguy-
Do what ever brings the most shalom bayis. Do not sweat the small stuff.
Your answer is by far the best (no insult intended to any other poster).
kapusta-
I know a bit about plumbing, and I don’t see how the hot water tank feed can be cut off and still have hot water come from the faucet. If the water heater is higher than the faucet, or air pressure can somehow fill the empty part of the tank, it would work.
When I was a camp waiter a year or two ago (ha!) we used to put away the perishables after shalishudos, but the rest of the cleanup was done motzei Shabbos.