I think it will be part of the queue as you suggested for SLOP.  Satellite views of the show building compared to other rides just make this a logical choice.  During construction, they can keep TWD open, but come 2020, they can just close TWD and finish it off as queue area.  Just my opinion.