I think that latest version of the Mustafar scene, assuming Hal wants to keep the Battlefront footage, is perfect! Looks good and not too “pristine” so to speak.

I think cutting Mustafar altogether would be an unfortunate loss, though Vader’s Castle would probably need to go unless one is able to change the background of the wayfinder scene to appear to be inside the castle, or maybe put some of the iron trees on the ridges in the establishing shot so it’s clear it’s the same place. I also agree that Ajan Kloss probably shouldn’t be Naboo. It makes for a nice parallel on a surface level but the more you think about it the more of a bad idea in-universe it seems for them to stick their big base there, especially on Leia’s part as has been said.