It doesn't mean automatically it's the HG, need to see precisely where it's coming from, could just be a bad pipe near the back, hopefully.
Crap heaters are due to dicky stats normally, or blocked matrix, etc NOT duff HG, just see how hot the pipes are to hold, they should be painful to hold due to heat.
tabetha