In search of solar storage tank

[adiydude]

I need to replace a Bradford White MS80R5 Solar Saver that has begun leaking. New BW MS80R6SS units include a heating element and are available via wholesale distributors only, and I'm not a contractor. Any recommendations for a DIY 'er? I'd prefer a dimensionally equivalent unit without heating element that I can procure and install.

 

[hopes2]

Not sure on similar dimensions, Superstor Ultra.