I would start there, particularly with the MAF and IAC.

To clean the MAF just go to the parts store and pick up a can of electrical contact cleaner. For the IAC I usually just take a can of brake cleaner (you should be able to use the electrical contact cleaner as well) and dose it real good and then use a old tooth brush to get in there and get everything out and then hit it with the cleaner again to rinse it all out.

I think you are on the right track though with the MAF and IAC.