The general ideas behind some of the choices taken deserve to be seen outside the Mann pastiche context. So if you were to retool it into a plain Star Wars edit I'd shift the mystery plot so the dart leads to Geonosis (called Kamino if you like) and Obi-Wan is just inspecting the troops the chancellor has ordered after the death of Qui-Gon.
Nice to see my young Leia at the funeral idea in use even if you did come up with it independently.