That’s all very much true. But even in the mainline films it lines up better. Luke tells Vader to come away with him. The last time we heard somebody say that was Padme herself on Mustafar, telling him it’s not too late to run away with her so they can raise their child. But his greed for power and jealousy of Obi-Wan stops him from considering that.
It’s really a shame in hindsight that Padmé’s character wasn’t created yet when the OT was being made.