Ok, looks like the cooling saga is over. With the calibrated temperature sensor the water temp stays right around 185 (thermostat is 185) under city driving with the AC on.
Going to give it a run on the freeway at 75 mph this weekend, and hoping for the best that the new fans/shroud, and water pump do the right thing.
