What do you think of placing the asteroid chase in AOTC before Obi-Wan lands on Kamino.
This would add some lacking tension to Obi-Wan’s detective plot and give the viewer some questions to chew on, like: “Who’s behind the ambush?”, “Was Obi-Wan the intended target?”, “Why were the Kaminoans expecting him?”, “Did they put up the trap?”, “Did they expect someone else?”, etc.

But the real difficulty might be recoloring Geonosis and only Geonosis, that’s what I was struggling with 😛