IF you want to go CDJ/DJM route, there is only one viable option: NEXUS (900s but preferably 2000s for the CDJs, 900, preferably NOT the 2000 for DJM). One hybrid setup you could consider would be using XDJ-1000s with a DJM900NXS mixer. Still a 3.5k!!! setup and frankly I don’t see how it would make you a better DJ over using a 1K SX2 (or RX if you want to go RekordBox).
Having said that, there is indeed – as Todd said – no added value for you in going to a CDJ/DJM setup imho. Skills from a controller (especially SX/SZ) are easily transferable to a club, most clubs already allow and more and more expect you to bring a controller anyway these days.
Since you know what your workflow is after over 2 years of playing, you can easily find out what software best suits your workflow. Then set a budget, pick 2-3 controllers that fit workflow/software/budget. Get some hands-on with the controllers on your shortlist and make your choice.