I've had both, although my 996 had been mapped, and was actually quicker than my 997. The 997, to my mind, is a superior car. It drives better, the brakes are better, it looks better (is that a can of worms I hear being opened?), and the interior is so much more modern than the 996.
Both of my cars had/have 'tip boxes and I really like them, although as people have said, unless you are in sport, they can be a bit lazy.
Drive a couple and see what you think, you won't be disappointed.