I would go ahead and replace the waterpump/thermostat if you haven't already and check the cooling fans are operating. Sometimes the motors bind up and will run slowly. With the car off, keys out, see if the fans trun with equal effort and can spin by hand. I had one fan bind up.
