I've run into the overheating problem before a few times. what it ended up being was the impeller on the drive shaft would slip when it got warm. So when the truck/car is cool the impeller turns fine then the metal expands as it get warm and stops turning on the shaft.A new water pump is cheap so you're going in the right direction