Change to a solar hot water system or a heat pump hot water system. I have changed my old leaking one to a solar one with electricity boosting (250L) about four months ago. It cost me $1595 from my pocket + government bonus. It has a seven-year warranty.
A new one using electricity may cost you the same money + more elelctricty bill.