replaced the tank today and added a couple extra valves.
cold on the left, hot on the right. In the event the tank leaks bothering can be shut off and the crossover in the middle opened. This will allow for water on both sides of every faucet while it is out of commission.
I should have done this when I replaced the tank 10 years ago.
Yes, my soldering sucks.