Since they don't seem to want to demo the old Animation building, what if they instead moved WDP there and demoed the existing WDP building, allowing for TSL expansion? I'm curious how much TLM theater would be impacted by that.
If it were me, I'd try to do something like Fyre Drill at Epic Universe. Basically a wet TSM. Also, toss in a spinner or something. It'd get DHS a ride with no height requirement, mostly at least, and a water ride all in one. It's also compact, so they could maybe utilize the old Pixar Place for a queue or something. That's just me armchairing though.