Just got back from the garage, they replaced high pressure lift pump and complete fuel tank.
Seems ok but smells a bit of petrol in the cabin, hopefully just fumes from when they did the tank.
Definitely gonna go for some kind of extended warranty after the 3 years - this kind of repair must be hefty cost!