I would look into a newer on-demand or tankless water heater if you’re going thru the trouble anyway. They are more efficient, and never run out of hot water. Just make sure you get the correct size for your application.