darklordoftech said:
They could remove the celebrations from future special editions.
I never thought about it until now, but because each updated edition of Star Wars becomes official canon, they could just release the OOT as the latest edition and it would be official canon again. All continuity problems solved. :)