Finally the diagnosis! It was the rotor, believe it or not! The bolt which held the rotor on broke and it was out of positon on the shaft. My mechanic replaced the cap and rotor. It now runs wonderfully again! Thanks for all of the suggestions. Next time I'll take it straight to my mechanic and won't try to figure it out myself!