That second idea is pretty cool because it is sort of a reversal of ANH’s climax.
It’s like poetry. It rhymes.
It’s almost crazy that wasn’t the ending to begin with. It makes perfect sense to frame it like that. And finally would “justify” why Maul just stands there like an idiot being jumped over.