Reply to DN-MC3000 vs. Kontrol S2 vs. Something Else(TM)

I currently own a Kontrol X1 and F1 and a DN-X1700 mixer. I love the 1700, but don't want to have to lug the mixer around all the time, and so I have been believeing about acquiring an all-in-one controller for travel portability.

I don't need 4 channels as I either i) do basic A->B mixing using only 2 decks, or ii) use decks C&D as remix decks with my F1 and mix using the F1's filters and faders.

What I do want is 3 EQs + a dedicated Filter knob per channel. A separate gain knob is also nice. I am leaning toward adding a controller with jogwheels...but don't feel like I NEED them...just want to

After much research, I am kind of settling on the following choices:
1) Traktor Kontrol S2
2) Denon DN-MC3000
3) Wait for the Behringer CMDs and get an MM-1 & PL-1 and pair them with my Traktor Audio-2

Kontrol S2 has tight Traktor integration which is nice, but no dedicated filter knob. I know you can use shift+gain to get filter, but isn't the gain knob an encoder? I don't like encoders for EQs or filters...I like having a center detente and defined stopping points for Min/Max on the knob.

The MC3000 is nice, has dedicated filter knobs, can control 4 decks using layer switching (though not sure how much I will actually use this). But it's traktor integration will depend on me (I actually don't mind making my own mappings) and won't be as tight as the S2.

Or I can go with a totally modular system...I can bring along only what I will need, not have extra/duplicate functionality, but will need 3 pieces of gear every time: a sound card (Audio 2), MIDI mixer (MM-1), and transport control (X1 or PL-1). Also, not sure if I want just 1 jogwheel or if I might want 2....not to mention that the CMD line ISN'T OUT YET!!! Do you hear me Behringer!