I took it back to the delear and he checked it and said it was too high. He was going to drain it to the right level, but decided to drain it all and put new fluid in. With the little bit of city driving I did, it seems to shift a little smoother - don't know if this is from the new fluid (old was still pink) or from the level being correct.

As for the surging problem, that's still there. Dealer mechanic thinks it more like the engine is missing. Interesting thing is that it's worst after you drive someplace and let it sit for a while. It's almost like the car is momentarily running out of fuel.

I'm going to have to experiment and see if I can reproduce it w/o the car being in gear as well.