Water Heater Replacement Recommendations

I have a 89 Terry by Fleetwood and my water heater tank now has a hole in it from a heating element. What would be some good recommendations for a replacement or at this point I might as well upgrade the whole thing.