I'd take it back to the shop since they didn't fix it (still has the problem), and give them a second chance to get it right. Possibly a thermostat, possibly the oil. Run OEM recommended oil ONLY regardless of mileage. Could still be fan relays, does it cool down w the ac on?