spark plugs

I would ditch the flex fan for the stock fan and see if that helps.A shroud would definately help.
A lean car will run hot,to much advance,plugged heater core are other reasons.
Is your fan a pusher?If it is it could be impeding air flow through the radiator.