LED's on the ECU sound correct. The test for the AFM in my opinion is not a valid one and does not accurately prove that the AFM is not faulty. I have a faulty AFM here that when pluged into the car will not run over 2000 rpm and gives the faulty code in diagnostic mode. You can try that one.
I do have a know good spare, but do not want to part with it. Sorry