Aaand I'm back.

Finally took it to VW who were inconclusive today.. Their VW tech wasn't in this week - They are VW/Toyota
So re-booked in for just shy of two weeks, however the diagnosis seems to be the HPFP at this point but obviously not 100% as it wasn't a VW Tech that looked at it..