Xbreed, I wonder if your throttle is acting particularly sensitive?  I am having the same problem in a completely stock 06 Baja turbo.  When I start it up, I get 2000 rpms.  It tends to stay at this level.  A couple weeks ago the throttle got real touchy and erratic.  Both problems at erratic.  I took it in to the dealer and of course it behaved nicely.  About a year ago they put in a throttle position sensor and some other items.  This is the 4th time I have had TPS type problems. 
  
Did you ever find the problem with your car?