Honestly, at best I was him expecting to be break out in the final war, but seeing how unpredictable the plot has been for the past two chapters, I wouldn't be surprised if the Id plot is already beginning. So far we at least received a reaction from Doffy every time a major Arc has ended since he was imprisoned, so it's weird Oda not dedicating a single panel to the current events taking place, especially with Kaido being down....
Oda loves to tease, so I rule out any further chapters being dedicated to the Crossguild, Teach, Revo's or Shanks.
Only unsolved plot points left that need to be adressed right now are Weevil and the usual post- arc reactions being shown from all around the world- which could be used as set up for Doffy's plot, even if it's just a single panel with a empty cell or something.