The dealer has now confirmed that they need to replace pretty much everything in the cooling and heating circuit (header tank, rad, 'stat, matrix and hoses), which was a bit of a shock. However the cost of all these parts is 'only' £700 so it may be cost effective to replace rather than try to...