I was figuring on getting a few more years out of my water heater, but maybe I should consider replacing it now. The price is probably already going up, just on the rumor of new government standards.
If you have the space, buy the new one and store it.