350 Heating Up at Stops

[cebra]

I have searched and tried about everything I could find. I have a 350 with some sort of cam, headers, Edelbrock intake, HEI ignition, Edelbrock carb. It is heating up from 190 moving to 210 and beyond depending on how long I sit at stoplights. It had a flex fan, I tossed that and installed a thermal clutch and 7 blade fan. I put a 170 degree thermostat in it, new rad hoses, heater hoses, heater core. The radiator is a 4 core and looks fairly new. I also reduced the timing down to 6 advanced and gave it a bit more fuel. It runs great (less it diesels a lot as the idle is high due to the cam) but I want to add AC and it is already running hot. Also, it keeps 200 at stoplights when I drop into neutral (rpm increases to 1,200 from around 600 in gear). Any other things to try?