Well, my issue all came down to a bad MAF (Have a new one on now - only a cheapie but will get a better one in the next month or two) I have also replaced the intercooler hoses (well 3 of them £30 from fleabay) fuel pump and filter (also have done the R5 thermostat mod - wow) and changed to Esso Synergy Supreme+ diesel. Now have warm, quiet running relatively economical car. What a difference. I'm smokeless too! I can also recommend regular doses of Millers Oils (I went through 2 bottles in 3 months) to clean out the system and injectors.