Setup Upgrade, Help needed

Hello everyone.
I've saved some bucks and I think it's time for an upgrade.
I currently use an X1, A4DJ, Laptop with traktor + stand for my club gigs with the audio 4 dj connected to the club's mixer and the X1 controlling 2x virtual decks and effects. For non-club gigs I take with me a mixer too a reloop RMX-30.
My question is should I buy a xone 42 and another X1 working with my a4dj on 4 channels on mono (I dont think I need stereo as most clubs in athens use mono configurations in their mixers. Or the S4 controller?
I think analog mixing is better than digital and the xone setup has more flexibility. The only drawbach I can possibly think is the size and weight but this is not much of aproblem as in parties etc. I carry a lot of stuff..
What do you think?

do you ever thinked about touch interfaces for traktor specific commands?
you can mix externally and use an iPAD or even a SCS.3d or 3m for other commands

Yes, I've thought o f these too but I prefer the more traditional route. Of course I'm allways open to new stuff but I don't have the money for experiments right now.
As for the scs I have not experience on it, wish someone could share with his opinion and experience
Thanks for reply anyway.:)

There are a lot of recent SCS topics around here... If you search you will find a lot of good ones. :D

I will, thank you.:)