Retconning Padmé’s niece to be Leia would be cool but it’d feel strange ending the movie with a somewhat grown-up Leia but then showing an infant Luke.
Very good point I overlooked. Maybe I’d have to move Luke and Leia’s fates to before the scene with Vader on the Star Destroyer, and that’s what ends the film?
Not sure how one would move the funeral to a few years later, but if…
If what? I’m interested in hearing your idea if you have one.