Pretty much spot on. Personally, though, for me, I'm betting that the amount of R&D on the "sway" nonsense could have easily paid for an additional show scene or three, I'm sure. The only saving grace as a fan of SWSA was that they have a real witch AA - however, given where she is positioned, I wonder how long she will have in the world until she has a "B-mode" or something. Just too exposed IMO for long term durability.
But yes, 7DMT could have easily been an E-ticket with a few more show scenes and even a slightly longer track - just like, as much as I actually like how TLM turned out, if they had done the original concept of a two-tiered ride it would have been far more impressive.