I'm looking to close on a house with a dead oil boiler and dead electric water tank. I'm thinking that the best route is a new oil boiler and changing out the electric tank to a superstor on its own...