No, I think the deal is great. I just accept that it doesn't make much sense for either company for Disney to try and by Universal out of the contract. And since Universal's portion of the contract is only going to become more valuable as Disney puts their weight behind marketing the Marvel characters through film and television and video games, I accept that it will likely not make sense for a deal to be made between the two parties for a very, very long time.
But the domestic theme park rights are a minuscule portion of the entire value of the Marvel company. And Disney otherwise got a great deal on the value of the company - I bet they make back half the purchase price on just films over the next 10 years. And characters like the Hulk and Spiderman will still be household names 50 years from now.
Of course, I could be wrong and Disney could spend an ultra-premium to Universal to buy out the contract tomorrow. But I don't see it happening. If you're Universal, why would you sell back the rights unless it's for enough money to completely re-build the "land" in another hot property theme, like the Transformers or Avatar (including paying for rights to the property) - plus an additional premium? And if you're Disney, why would you pay all that money when you'd just have to spend more on top of it to build a land (or a park) to effectively use the characters? Especially when Disney is making money right now off of the property by leasing it to Universal without spending anything additional.