Fang Zei said:

The o-neg, in its current conformation, is still 85 to 90 percent of the OOT. With today's digital technology it would be relatively straightforward to use a new scan as a starting point and then just scan in the missing pieces and put it all together.

Well, hopefully that's what they'd do. Especially if you're right about there being an OOT release before Ep. VII, and I think you probably are since it's the most likely time for another home video release, and I doubt they'd not include the unaltered films