Running too hot

If it is overheating at a stop, the first thing that comes to mind is a lack of airflow across the radiator via the hydraulic cooling fan. Have you checked their operation? One common failure point is the coolant temperature sensor/fan switch sensor located at the left rear side of the engine (Illustrated picture). This engine has another sensor at the front side of the engine, but this sensor is not responsible for fan operation. The sensor for the fan is usually in the $70.00 to $100.00 range and maybe a little more at the dealer, I say this because this sensor gets mixed up with the front sensor that costs $30.00 to $40.00 that way you have an idea that you are getting the right one.