is the fault engine hot or cold? a weak spark can produce a stall in gear, will get worse as it gets hotter..
reading through the original post again, i think you may have a vacuum leak somewhere, with injected cars, if there is an air leak, it will idle faster, as it simply throws more fuel in to compensate. if its up stream of the MAF, its unmeterd air and the discrepancy between the air the MAF sees and the reading the o2 sensor sees (basically the unmeterd air) may fool the car into thinking the MAF is faulty...
its an old car, so perished hoses are very likely. Does the cruise control work? if not, I'd start looking at the vacuum hoses that go to the cruise control. its amazing how many running faults can be traced to non functioning cruise control units with vacuum leaks