Everything else seems OK. I checked and cleaned all the earth points in the engine bay (at least all the ones I could find).
The MFA has been given a low priority now as I need to replace the fuel pressure accumulator (on order

) to get the car running again.