The rancor rampage can actually be cut by having Boba v Bane be the climax. Then cutting to the Fennec assassination scene.
I like that, but logistically you’d need to keep Grogu on Tatooine otherwise there’s no existing reunion between him and Mando.