Fix what you have first as a tank leak indicates the system is working just fine.

I see a lot of love here for electric systems, but they all ignore the elephant with electric. Power outages.

Figure out the cost difference between replacing with electric and patching/replacing the tank. Put that difference into Solar + Battery. Bank the money you save on electric to finance the new heat pump.