I had a similar problem with mine and after a very thorough throttle body cleaning (both the plates and the sensor ports in there) its been running great. Don't know if you've tried that yet but its worth a shot for a 4 dollar bottle of carb/choke cleaner.
