This is going to suck, but....you're most likely going to have to get rid of the electric fan. For 3 years I suffered overheating issues w/my rig when the a/c came on. I cut a hole in the hood, replaced all the parts you did, went with TWO different electric fan setups. I added an extra fan in front. I even got a Ron Davis Racing radiator and the custom dual electric fan and shroud to go along with it. Still overheated. Out of desperation, I finally pulled the electric fans and purchased a new OEM stock fan and fan clutch.
Problem solved.