Just got through with the symptoms you mentioned...tuned out to be the MAF which was replaced under Emissions Warranty.
One question: does your car die with the a/c on at idle? That was a symptom that slowly became more pronounced (and aggravating) as time went by.
Regards, Art