I have had heat soak problems in the past and someone suggested changing the 'coolant temp sensor'.   Seemed strange but it helped correct the problem.  Don't buy aftermarket ones, they don't hold up.  Buy OEM parts.....

Hope this helps!

Those oil filler cap seals have been NLA for about 2 years. The oil filler cap O rings have been NLA for more than 15 years.