Well I got the fuel filter changed out. I had to remove the battery. I didn't have much trouble with the front connector (nearest the grill) but the back one took a bit of time. You just need to take your time.
While I had the hood open I went ahead and cleaned the IAC module, as per the spark plug change instructions.
Put everything back together and I swear that it runs better then before. If the fuel filter had been changed I would be surprised there was so much junk built up around it but the gas that was left in there looked clean.

Please post the details on the Mass airflow circut fix. I would rather do it now then wait for this to happen again