318 Over Heating (Its Not Mine!)

I would think going to 3 row may be in order.
Make sure that fan is wired as a puller and not a pusher.
Hope the after market water pump was not a reverse rotation (magnum) as opposed to a standard rotation (pre-magnum) ....Just throwing ideas out there, good luck.