I had the exact same problem you are haveing with my vehicle. i went round and round..replaced cap, rotor, wires, plugs, fuel filter, timing chain, valve springs, messed with timing, swapped distibutors, checked all vacuums and all that was wrong was a bad mass air flow sensor....I read that you said you cleaned yours. that is good but if its bad it wont do any good! i would try replaceing the MAF with another one and seeing what it does. it cured my problems and my car was doing exactly what you described to the T!