Try cleaning the MAF sensor wire. I'm not thoroughly familiar with that unit, but MAFs I have worked on have a tungsten filament that is heated by current running through it. As the air crossing over the filament cools it, it changes the level of resistance in the circuit, so the ECU can determine how much air is flowing into the engine.
I've had to spray brake cleaner inside the MAFs on a couple of my cars (94 Ford Probe, 92 Jaguar XJ6), in order to clear codes and improve both idle and part-throttle operation.
On those cars, if you pull the MAF, you can see inside where the tiny filament is. It gets slightly crudded up with fine dirt, even though it is downstream of the air filter. When it is crudded up, it doesn't cool down as much when air flows over it, so measurements go out of range, etc. Sometimes this shows up as a false O2 sensor lean code because the CPU thinks there's less air and leans out the mixture.
Don't touch the wire with anything except brake cleaner. Try not to get the brake cleaner on any rubber or plastic parts in the MAF. When you're done, disconnect the battery to reset the computer.
I figure this thing has been cleaned up about every 30K to 50K miles on my cars before the problem comes up again.
Worst case, you spend $5 on a can of brake cleaner and about 10 minutes. If it works, great. If not, then at least you won't have to clean it for a while.
Another thing I had a problem with once that sounds similar to your symptoms was that I changed the thermostat on my 92 XJ6 with the recommended Stant thermostat. However, Stant's reference in the book is wrong for that car, and the Stant unit opens at 180', whereas the Jaguar unit opens at 192'. The hotter temp thermostat really improved my mileage, too.
BTW TT, if you are unhappy with that car, I'd be happy to take it off your hands (cheap, I'm afraid -- I'm divorced and broke). I'm sure you have maintained it meticulously, knowing how you are.
[edit: I cleaned the MAF on my mom's 95 Mitsubishi Galant, too, and that cleared the check engine light about 20K miles ago, too.]