My Grandson and I had to replace the water pump also. The fan blade would move over an inch when wiggeled and the pump was noisy. I could not believe that it did not leak! We also changed to a 3 blade clutch fan from a 350 chevy truck. The car is much more quiet without that 4 blade fan roaring and sucking up horsepower. You should change fan type for sure. If you go with a factory clutch fan make sure it turns the correct direction. Jay 6155