Greg,

I agree that a sub panel by the water heater would be the best option. However what if there is no room? Say the new water heater is in a closet with no room for a sub panel? Then what?