I agree. Right now they're both fine. I'm just thinking long-term and the original question was about there being any chance for Disney regarding Marvel.
Disney is busy doing a bunch of other stuff, but if they want the rights then 2021 or 2022 is the best time for them to get their characters back. Disney will have all of their new stuff and it will contrast greatly with the state of Marvel Super Hero Island, which will be 22-23 years old. Disney takes forever to actually plan and build anything, so the earliest we'd see any new Marvel rides built from such a deal would probably be closer to 2030.
2030 or later would give Disney enough time to be Disney and it would give Universal enough time to re-theme or rebuild.
I'd still prefer Wakanda in Hollywood Studios, but I wouldn't mind if it took the Wonders of Life Pavilion. Something, anything needs to go in there. I mean, It would make for an epic indoor butterfly house, but that's probably not enough of a draw for Disney.