I think it might not be a good idea to change more than one thing at a time. Perhaps it might be worth either disconnecting the battery for half an hour (make sure you have radio code etc) to try and get the ECU to clear it's fault codes or (better) get them cleared with a decent fault code reader. Then run the car for a while and see what fault codes come up. It would be interesting to see if they're the same.
Also how about clearing the fault codes when it's cold, then starting it up and running for less than a minute and reading the fault codes again. It would be interesting to see how long you have to run it for the codes to come up and what order they come up in.
What sort of airflow meter does it have? We haven't spoken about this yet as far as I can remember. Is it a "hot wire" one? If so, I know they can sometimes be troublesome on other makes of car.
Finally, can you check the lambda reading on an MOT station gas analyser to see if that gives a clue whether it's running too rich or too lean?