Also, Since they had the belt off for the water pump work, I would look over the pulleys, tensioner and belt routing for anything obvious.
The tapping that changes back to clunks, taps, etc, intermittently kinda sounds like a wire, clamp, connector, bolt head or some other random part getting...