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.
Since all the shows already intertwine with each other, I’d say it’s better long term doing it the way Smudger’s doing it. Combining it all under one banner is better than having .5’s or separate titled movies you have to insert into certain spots to get the full viewing experience.