Thermal store replacement

I need advice on replacing my Elson Coral E. It’s now leaking following an immersion element replacement recently.

I’d prefer another direct open vented thermal store system. I’ve read reviews about what’s available but I’m not convinced and have concerns. Be great to discuss with someone knowledgeable.

At present however, due to the leak I’m thinking about having my Elson drained and dismantled if that’s possible while I try to decide on another system. I just need water in the taps and to be able to flush the loo.