I have seen it mentioned that there was a requirement in the contract that elements from the last two movies eventually be added. I haven't been able to find any actual confirmation of this.
Having been to WWoHP, IMHO it is definitly up to the quality I would expect from a Disney attraction...