before you go down that road, have you checked your heater water pipes. on my 300tdi with the engine at normal temp (on the gauge anyway) if i then disconnect one of the pipes from the matrix i just get a lack luster flow of tepid water so the heater is doing the best with what is has but doesn't stand much hope.
i have no idea why the water isn't red hot and pressurised