[madmanmapper]

(This may be a bit amateur for you but...) have you tried disconnecting your battery? Perhaps this is a simple case of using the wrong spark plug gap. Tighter gap gives faster idle I think. Though I'm not sure if if would go to 2000 rpms. Hmm... why not adjust your throttle? There's an adjusting screw for idle on the throttle.