@Bryant,
I was a long time traktor user myself. Bought some XDJ-1000's to use as HID controllers alongside my S8 and got the pioneer bug big time. I've now ditched traktor fully and bought the DJM-900NXS2. No regrets here, it's an amazing piece of kit. Have tested it with traktor for someone and it works as you'd expect. I can't really comment on the NXS as never used one before this. This just came out and lured me at the right time. Newer means better supported going forward I guess. So if you can afford it go NXS2. A couple of reviews say just that in fact. Will you just be left wanting if you don't?
Out of interest, what are you using to control the decks/transport in traktor? (X1's?)