I just thought of something...
In Episode 2, when Obi-wan MacDonald is on Kamino, he could instead break into Jango/Boba/Fabio/Whatever Fett's room and find some documents or something. He turns to leave but finds Fett there. Music, tension. etc. Obi-wan awkwardly manages to leave or something.
Probably not possible without re-filming some stuff, but whatever, Just an idea...