What is your current antifreeze-water ratio? It can easily be checked with one of those little floating ball testing tubes (the more balls that float = the better the protection in both hot and cold weather).

That may be off-base since the overheating has happened both before and after the service work, but it's something simple that can be checked and changed if it's the cause.