heating system have a few things to look for; tstat open/closed. you've solved that. dirty rad; solved. the new fan work? does it pull enough air to cool? whats the CFM rating on the fan. if it isn't high enough then you'll over heat, yet on the highway might be ok as there is enough airflow through the rad.
other things to look at are bad waterpump, just a bad rad and bad clutch on fan. but no clutch fan on yours so i'd start first with you efan, and see what it actually pulls.
if it all checks out bad headgasket is also possible