After watching todays episode it occurred to me that it might be better moving all the Mando/Grogu storyline specific content from TBOBF out of your edit and combining them with the first two episodes of this new season to make a third chapter in your Mandalorian story. That way the Boba Fett story could be its own thing (with a brief supporting appearance from Djarin) and the forthcoming six new Mandalorian episodes could form a chapter four. Just a thought.
This is a consideration and I’ll see how the new season plays out. At the moment the plan is to move the Luke-Grogu scenes out of this edit and into episode 4 (I’ve just started a new thread). However, if there is an obvious time skip during season 3 and enough material for 1.5 movies I will certainly play around removing the Boba material.