Hi sierrafery,
Would be great to hear back once you've got your EGT results. You've got your hypothesis, you've done your bench tests (many many hours) and part of the road test ( your car drives ok). Doing the EGT will finish it off.
I find the MAF is another discussion (no doubt another illuminating one). Well I'm easily confused too.
Whatever the outcome it's been a good read seeing what a new set of eyes may or may not come up with where others have been before. :)

