I probably should have mentioned that the ETA is already eliminated as a culprit - I had just replaced it with a date coded late production unit before taking the car in for the test. I too may have been getting ahead of myself, but at least I know that's not the issue now.

Parts arrive on monday. I decided to hold off on discoing the MAF in fears that it could hurt something else. Once I get everything installed I'll update the thread.

Thanks for all your help!