Tips for now - make a TS reservation in City Walk for lunch. As of the last reports, CS is still a really long wait. Now, the effects of getting rid of mobile order may help, but you won't know that probably until you're just about to leave (aka, for a few weeks for people to go and report back). So, better safe than sorry...
And TS in City Walk isn't so much more money than CS in parks...probably $5-$10/person at most places (including the tax and tip)...