Did you resolve this?
"Seen thread on Water tube grommet in oil pan, did not replace and don’t believe it is a problem since there is no water in the oil."
I did all the same things you did, and it still overheated. Then I found the thread about the grommet.
Absolutely, definitely, replace...