I recently had the same overheating problem with my Volvo MD11C. 1) I had an abstruction in the raw water inlet valve. 2) I removed the exhaust manifold and had it boiled out.
It now runs cooler and discharges more water out of the exhaust. If the manifold has never been off and boiled out that maybe the annswer to your heating problem.