Reply to Lots of Gear: Help me sort it out?

Through a combination of reasons/circumstances (ranging from my own compulsive gear shopping to getting a "bundle" with some items I didn't need thrown in) I have acquired way more gear than I need. I'm still in the beginner stages, and I have plenty of room to grow into my setup. But, I was hoping some of you smart folks could help me figure out an appropriate combination of controllers, etc. and help me decide what to sell, or at least put on the shelf for a later date.

I currently have:

• Kontrol S2
• Kontrol S4
• Kontrol X1
• Midi Fighter Classic
• Midi Fighter Pro
• Traktor Audio 2
• Traktor Audio 6
• Axiom Pro 49 key
• Novation MKii 25 key
• APC 20

Basically, I had my setup (S2), and then I bought a used kit from someone that included a great price on the S4 and a bunch of stuff I don't necessarily need. I'm starting to learn things on the production side, so my goal is to end up with a combination of gear that is suitable for production and DJing. My current thoughts are:

DJing:
Kontrol S4 for main controller
Midi Fighter & Midi Fighter Pro to augment S4 (filters, looping, etc.)
Traktor Audio 6

Producing:
APC 20
Axiom Pro
Possibly some Midi Fighter action if I can workup a good Ableton mapping

I would then sell the S2, Audio 2, Novation MKII, and X1. Does this make sense/seem like a reasonable setup? Is there some awesome feature of the hardware I plan to sell that I am overlooking that would justify keeping this stuff hanging around? I know some of you guys have some monster setups, so your advice would be appreciated.