The best bet for Lucas, if he wishes to fix this mess for the 2007 "archival" editions would be this plan of action:
1. In ROTJ, delete Luke's line of "I have no memory of my mother." As a test, I edited the scene so that the line is removed, and it works surprisingly well without it. In fact, it makes it appear as if Luke does remember his mother, but that he is only asking Leia.
2. In ROTS, re-edit the Padme death/Luke and Leia birth scene so that Leia is born first, and make it appear that she is the one who spends the most time with her mother and is with her at death.