In my opinion, ditch the whole system and go for the viscious fan clutch, best upgrade I ever did, no hydrualics, TDMs, or Cadillac valves to worry about.
You may want to check your Temperature Sensor, TDM, & Cadillac valve, I kept having these go out which made the fan stay on, here's a good...