Well yesterday was a result.Baffled sump and windage tray fitted:

Had to trim a bit more off the baffles to clear the pick up pipe but it's all on, filled with oil and pressures seem to be OK. I suspect there's still small bits of plastic floating around so I plan on dropping the sump off again in a months time and checking the pick up pipe again.
Today I need to fit my upgraded headlight loom and tidy up the car, clean it and double check everything works for the MOT on Tuesday morning.
Nick