Yeah. There’s a part of me that thinks JJ originally had a version of the movie closer to Restructured, but realized in editing that he needed to pull the First Order stuff earlier to keep them more active in the story.
Maz’s castle and the interrogation(s) will be the most important changes in this edit.