Reply to Descission VCI-400 or NI S4 ??? + Control F1

Hi,
i will upgrade my gear .

But i need help for my descission.

I am using the VCI-100 Arcade edition at the moment.

I want to buy the VCI-400 Ean Golden Edition, but will it be compatible to the new Traktor Pro 2.5 launching end of May ? Will DJTT create a new Mapping for it ?

I will also by the new NI Control F1.

Would it be better to use only NI Stuff : NI S4 + Control F1 or does it work the same (or better) way in this combination : VCI-400 + Control F1. What do you believe ?

Regards
Kabbi