Can't wait to see the other changes.
Metropolis/Take The Time?
Yeah, you might think so considering they played UAGM over the summer in Europe.
Maybe Another Day for Surrounded? And a different 6D's section instead of WIMH/TTTSTA.
WIMH/TTT... is likely to stay, IMO, as it is the shortest self-conclusive one-two from SDOIT (maybe ATC2-LT/GF may fit in the schedule, but I think they will stick with the former pair just like they didn't swap TMW/FT with, let's say, TDOE/OLT).
Another Day would do fine, if James can handle it.