Hi mikeh67, i have the same issue, got HPFP & lift pump change and then the garage tried to fix the fuel in water sensor and got all strange code after that.
By chance do you know the part number for the the connector they've replace,, can find it online?