If it overheats while moving 40+ and no loss of coolant or other indicators, I'd change the pump/thermostat. If overheating at a standstill, but not while moving, diagnose fan also.
Any faint hint of coolant smell after driving coming from the motor bay?
Fix it sooner rather than later... Overheating the motor will lead to much more work ($).. Good luck edsigg