Hi! I just purchased a 1944 Cape and I need to replace the existing electric hot water heater. I have done some research and determined that I would like to buy a 40 gallon tank with a good warranty. Any suggestions on an efficient, affordable unit? If it makes any difference, I have a boiler that uses oil right now, but I will eventually be replacing it with a gas boiler. The city gas line is available to me, although it is not currently in my home so a gas water heater is not an option at the moment. Thanks!