Car getting real hot....

I wouldn't be too concerned about 200-205 degrees. With your rad cap & antifreeze in the motor you should be able to see 210-215 safely without blowing the cap. Back in the eighties I had a 13-1 340 & it ran all day at 180 to 210 degrees.
Don't forget that antifreeze not only stops your motor from freezing but also raises the boiling temp of your coolant.
Montreal stop & go summer traffic is brutal (hot & humid) My guess as to why your pre-rebuild motor did not overheat is that it was tired & probably didn't have much compression left to build heat.
As others have said, ditch the next to useless flex fan & that restrictive shroud & you'll see an instant improvement