A simple test for the water pump. when it is warm and making noise shut it down and try to rock the fan towards the engine and away from the engine. If the fan is cracked it will flex and click. If the bearing is bad you will feel it move.

Steve H