Reply to What Traktor controller

I'm picking up my old hobby. My old setup consisted of 2 SL1210M5G's, Xone:4D, NI Audio4 and Traktor 3. I sold the whole bunch 4 years ago and am now believeing about what new setup to get.

I'm getting the SL1210M5G's again for when i want to go old school with vinyl. I am getting the Pioneer DJM900Nexus as a mixer because of the built in soundcard with scratch certification and of course the effects. The only thing i am not sure about is which controllers to get. I want to be able to control 4 decks in traktor independently so i was believeing of two Kontrol X1's. But these things have been around forever and with the new functionalities in Traktor it seems likely that they will release a new Kontrol soon.. or am i wrong believeing that?

So the question is: what is the best thing to do..? get the X1.. or wait for NI to release something new?