Upgrade recommendations for the S2???

Hey guys, ok yes I know there a a bunch of threads similar to mine, but mine is different I swear!

Anyway I would really appreciate your feedback and suggestions on this topic. So...... I've had the S2, for about a year now, and I must be honest, it's one of the best controllers I've ever owned. With it's tight integration to Traktor and great features, there's no wonder it's so popular with everyone. Well as much as I love it, lately I've come to not like it so much anymore.. Firstly I believe that I've grown more as a DJ since buying it and I feel slightly limited with it, and also yes as with having R.G.A.S. I've also become quite bored of it.. There are a few things that I miss having on the S2, like dedicated filters, proper LED feedback, more "pro" outputs, better build quality, etc... So after believeing a lot about this, I believe I need to move on from the S2, and upgrade to something which will hopefully tick all my boxes.

What I would like to ask is what controller do you believe would be a good choice from the S2 that packs more features, has the things that I mentioned, and also works great with Traktor? I've been looking at a few options online, and the more I research the more confused I get hahaha...

So far these are what Im looking at maybe looking into.. (In no specific order)

1. The VCI 400 EGE
2. The Livid CNTRL:R
3. Electrix Tweaker
4. Z2 + X1 Combo

I know that there are other possible options out there, but these stood out to me for their features, size and reputations. I need a controller that's also portable as I travel, and fly a lot, so these options fall into that category, and as you might have seen I'm not so worried about having jogs or not, it's about having a controller thats feature packed, and works with Traktor virtually out the box.

So after reading all of this what would you suggest? Did I miss any possible other controllers? Any suggestions that I should take a look at? Thanks for reading guys. Cheers.

Dustin V