Reply to *Need your opinion*

I've been Djing with a Numark Mixtrack Pro for over a year now. Which I can say was a great start for anyone that wants to start Djing and doesnt want to spend a lot of cash. But I've gotten into Djing so much that it's time for me to start upgrading. I've been looking into two different set ups. This is where I need your opinion.
A.
*Native Instruments Kontrol S2 (Used for $300 from a good friend)
*2x Native Instruments F1 (New $250x2= $500)

***Total $800

OR

B.
*Native Instruments Kontrol S4 (New $900)
*Dj Tech Tools Midi Fighter Pro (New $300)

***Total $1,200

Both is a huge upgrade. Just B. will take me a lot longer to save up for.