I may have missed that you already attempted this fix, but I had the same issue with overheating, the eventual fix was adding the bypass hose from the top of the water pump to the intake manifold, allowing coolant to circulate in the block before the tstat opens. Also I changed tstat to 180.