Reply to Ableton Controller?

Anyone know about anything new in the controller realm for ableton coming soon? I have been a Traktor DJ for quite some time (before that old school Vinyl) and I just made the switch. I have been looking at the VCM-600 and APC40, anyone got a better suggestion? I like the multiple clips but I like the DJ style of the VCM600. Anything new coming soon?

I also have the NI S4 & 2 Kontrol X1s that I am using with Traktor, anyone map them to Ableton? Thinking about selling the S4 and getting something new to play with..