id go with a new fan clutch and have them see if the water pump has any play before buttoning it back up.