Spoke to the mechanic today and it's definitely the matrix. So off we go on the hunt for a Mk3 jobby!!!
If your not bothered about the heat for a few weeks just plug the water pipes into each other and keep your heating turned off