I don't think this is a classic case of water hammer or a bad angle stop. For instance, when all fixtures that have a shut-off valve are shut off... I still get the noise. I'm almost certain this is related to the HWT somehow, I'm going to buy new heat traps and try those out.