Ok, so, it was the oil cooler. Where the hose connects was rusty. It took out the hose and there's a few pin holes in the oil cooler itself. So a new second hand oil cooler and a few new hoses and it's back n the road.
Love my X Type.