Update
Fitted fuel filter when it finally arrived and car ran okay but engine management light still on after 15 miles and fault codes would still not clear. Realised there is option to reset adaptive map did this and then fault codes cleared and no engine management light. Done 180 miles today with no problems car running great.
Fingers crossed all is now good for Goggles and Gauntlets.
See you all there
Big Steve