Agreed, DCA's ToT was always knocked as a lesser tower than DHS, and it honestly couldn't shake that. MB stands out on it's own as a fun/action oriented tower ride, which fits the design of DCA's tower way better than ToT did. As for which is better, it's all personal preference but both are great for the directions they take (ToT = Mystery/Suspense, MB = Action), though when it comes to drop profiles, MB's profiles are more intense and it's a noticeable difference.
As for AC, I'm almost getting a inkling we're getting another Galaxy's Edge opening situation where the ride opening is not the headliner. Avengers was supposed to be -the- headliner, but no clue when that'll even break ground. Quite frankly Spider-Man should be a headliner, but I'm not 100% sure it's gonna' be one.