Reply to Next upgrade, all in one controller or modular setup?

Hey all, I'm quite new to these community s so I'll start simple.

For a while (1 year +) I've played on a Kontrol S2 + X1 combo. This combo has been wonderful and has served me well. However as I have recently finished my last year of school and am on break til I enroll in uni, I have been accepting more and more 'professional' gigs, weddings, corporate gigs, that sort of stuff, I thought that it would be a good idea to upgrade my setup.

However I can't decide between an all in one controller, like the Pioneer DDJ SX, or a modular setup with single deck controllers for Traktor with a mixer in the middle. I like both approaches with the all in one controller being easier to cart around to gigs but with the modular setup easily expandable as new tech comes out.

The two pieces of tech that sparked this decision is the DDJ SX + Viper's mapping and the Electrix Tweaker. I would love to some how include both but being what most would consider a 'bedroom DJ' with only starting experience with performing as well as the fact that I've only recently turned 17 and therefore won't have a huge amount of disposable income to spend on gear I have accepted that it must be one or the other or no upgrade at all.

That's where I hand it over to you, you fine people of the DJTechTools Fourms. What would you suggest as the next logical upgrade for a 17 year old fledging bedroom DJ, a better all in one controller or a modular setup?

Thanks in advance.
P.S. Sorry for the wall of text guys