Just to finish this off, after much fiddling around and trying different things, the two items that made a huge difference were:
Replacing the rubber joints on the intercooler/turbo which had gone like bubble gum.
Fitting a brand new #4 injector
Runs like new, sounds different and has a very...