help with over heating

If it was just "not enough fan" it would run hotter in town and cooler on the freeway.
Hotter on the freeway means not enough coolant flow volume.
Make SURE that stat opens all the way.

I think the shroud is making it worse if it's an electric fan.

Has the block ever been flushed?

I went through the overheating wringer for a couple of weeks after I first got my car and it had the original radiator with a mechanical fan (no shroud)
First I backflushed the radiator and a bunch of crap came out of it, so I pulled the hoses and thermostat and used compressed air to blast water backwards through the engine and a bunch of crap came out of it too.

That did it, and it ran fine after that.
I have since put a new 26 inch radiator in it with an electric 17 inch fan, but thats another story.

Try backflushing your radiator into a bucket and see if maybe there is crap plugging up the tubes in yours.
If there is, then flushing the block and heater core will also need to be done.