overheating when turning off car

Ever replace the water pump?
I had a car years ago that electrolysis had eaten the impeller enough that at an idle it wouldn't get enough coolant movement but would be fine at speed.