you may also want to try disconnecting the brake booster vacum line and putting your thumb over the hole, see if the car shuts off any better. That is one way to eliminate the vacum booster as a source of problems. Depending on the mileage, have you checked the vacum pump? If you have a vacum guage you should read approx 18" of vacum when the car is running.