I am having the exact same issue and the dealer has told me on about six different occasions that it was a vaccum leak. Short term resolve and then it returns. This time around they have reprogrammed the PCM, replaced the IAC sensor. Wait and see at this point as they are awaiting word on whether or not they tear down the tranny (synchros gone perhaps, in ESPs hands now.)
Fern