Maybe you could merge Supply Lines with Storm over Ryloth and juxtapose the Anakin/space plotline with the Cham Syndulla/that Nikto Jedi scenes. The Toydaria/Lott Dod angle would be gone, while the Jedi general and his clones’ final stand could happen just after the Core Ship is destroyed by Anakin, allowing for the supply ships to break through.

I honestly kind of like the humor involving the B1 droids 😄 though yeah it should be reduced to whenever they don’t break the mood of the scene.