Reply to Pro DJing Setup?

I want to change my setup for a more professional use. I already have a Numark Mixtrack mk1 (which is very good for basic djing but it's not for advanced) paired with a Pioneer Djm-400 mixer and an Esi Maya 44usb soundcard working with NI Traktor Pro 2.

-My 1st option is to buy 2 Pioneer Cdj-400 (I hate the Cdj-350), if there is somewhere available, paired with my Djm-400 so I will be able to play both with Traktor and cds
-My 2nd option is to buy a Pioneer Xdj-r1 which also can work both with Traktor and cds
-My 3rd option is to buy a Pioneer Ddj-sx
-My 4th option is to buy NI Kontrol S4 mk2 (though I don't like the small platers)

Which is the best option you believe? I want to keep playing with Traktor for now and maybe in the future I have the ability to play and with cds too...