Spider-Man is what gives me the most conflict about MSHI. Take it away and MSHI is average. Hulk is great but it it would still be the same if it was rethemed to something else.
I'm at a point now where I wish something would happen with Marvel in Orlando whether Universal finally build something new or Disney take the IP back. my concerns with Disney taking it back is that Spider-Man has to go which would be the biggest travesty in theme park history and Disney aren't exactly doing great things with the IP but they're doing something. Guardians is an excellent ride and surpasses ToT as far as I'm concerned but it's impossible to do at DHS.
Good luck talking to Comcast about it, they ain't gonna give the East of the Mississippi Marvel rights back to Disney anytime soon. After all, Universal (under MCA at the time) negotiated a contract that heavily favored them over Marvel as part of the condition for MSHI at IOA and they wanted to become like what Disney was, and Comcast wanted to aim to be in that spotlight.