Reply to help deciding new setup

Hi everyone - i'm looking to go a new direction and hoping for people experiences and set up ideas

currently i am running time code vinyls through my kontrol s4 to control traktor

i am now looking to get a pair of cdjs and mixer to increase portability and flexibility (i.e use non traktor audio sources)

given my love of the s4 i was believeing it may be good to give the z2 a go with a pair of cdjs - if i do so am i better off (with my limited budget) to get cdj-400's with the HID or to get some cdj-1000's (which i like the look and feel of better) and use timecode cds? or even not use the z2 and go for a djm?

any help would be great

thanks
Tyson