"Diverting through the HW tank stops the noise all together "
Does the noise stop with HW on only; CH off?
If so, as boiler and pump are running with no noise, problem must be in CH circuit. Resonance and/or partial blockage in radiators or pipework.