I tend to put scenes into 3 categories…. Not needed, nice to see, need to see. Having only done a very rough cut of episode 4 the Naboo scene is very much a “nice to see”. However, that may change when I see how the Kleya infiltration flows. It may play out better with a brief Naboo clip before Kleya detonates the explosives.
As for episode 3…… it’s now complete. I’m currently upgrading it to 4K, then the only thing left is the opening crawl.