Upgraded water pump?

Anyone running or know if I need to run an upgraded water pump for my 2004 with a 4.0?

I had added a clutch fan last summer, and I’m starting to have a coolant leak, someone told me that throwing the clutch fan on the oem water pump could have sped up its death.

Any links to superior water pumps that can handle a clutch fan would be appreciated!