I have an idea for a future PT version: we will not see the birth of Luke and Leia in a “chronological cut” (a version of the film that is part of a “chronological” series of cuts for the first six films that can be watchable in chronological order). In fact, when Obi-Wan returns to the ship after his duel with Anakin, we don’t see a living Padmé at all. The last time we see a living Padmé will be when Anakin Force-chokes her, and we can assume she died after Anakin and Obi-Wan begin their duel. During Anakin’s transformation into Vader, we will not see the childbirth.
We should assume that Padmé died on Mustafar, and that Luke and Leia are just babies whose parents were killed during Order 66. Also, in a “chronological cut” for A New Hope, everytime Obi-Wan, Beru, and Owen bring up Luke’s father, they’ll be referring to a different Jedi and not Anakin Skywalker. Also, Luke wouldn’t mention “Skywalker” when he arrives at Leia’s prisoner cell in the Death Star. That way, we can preserve “I am your father” in The Empire Strikes Back without having to make it seem like Anakin and Vader are separate characters.