recommendations

I have a Weil McLain Gold Plus 40 gallon indirect oil fired water heater which, judging from the water on the basement floor and the leak at the bottom, needs to be replaced. I haven't had to buy a water heater for 15 years and have no idea what features to insist on, which features are nice to...