Further to my previous posts on this, a bit of an update -
I have found out that, the only time it completely cuts out and give the "fuel injection system error" is when the tank is quite low, eg range reading around 60 miles. I popped 5 gallons in today, and, whereas before, I could replicate the fault code / shut down by driving at high revs - I now cannot.
However, even with a full tank, performance is still not right, and the car is intermittently holding right back, between 3 and 4,000 rpm. It has on a couple of occasions also failed to start first time, with the range on about 100/150 miles.
I looked at the pre-supply pressure on the live data, with a decent amount of fuel in the tank. This value is supposed to be 4 bar. Mine was 3.6 to 3.7 bar, so under, but not enormously - this dropped to about 3 to 3.1 bar when revving stationary - whereas it's never supposed to drop below 3.8 bar even when driving at full chat.
SO I concluded the pressure was lower than it should be. So, so many forum posts suggested the pre supply pump under the car is the common cause of this fault. So I went to the lovely Euro Parts. They only had a "HAAS" one on the shelf, for about £70 with a discount code, and I bought this. I got back and fitted it, and the noise it made was AWFUL! Also, the pre supply pressure, whereas on the old pump was 3.7 bar, with the new one, it was 3.4 bar, dropping to 2.5 bar when given some revs!
So to cut a long story the new pump went straight back, as it's absolutely rubbish, and can be heard over the diesel engine! I now have a genuine pump ready to fit, but I haven't got around to it yet.
I am thinking I may also just do the one in the tank as well, for the sake of futureproofing. Hopefully then my issues will also go away.