Not only do I suspect that's right but it also serves a few external purposes imo.
A) Touchstone to the original trilogy which has been quite since 2006.
B) That touchstone is none other than Stewarts Prof X, hell yeah!!
C) The various aftermarket ways to repackage and sell DVD sets.
I'm trusting the actual story idea itself is valid and will WOW us of course but I think Stewart also has to be alluding to DoFP.