As I'm just getting to this point in the edit I thought I would point out that I will be taking out Leia being Luke's sister. I feel it's unnecessary to the plot in this particular case and will overcomplicate a relatively simple narrative. It's really only there at this point to give Leia a reason not to choose Luke over Han but I feel it speaks for itself. To make it more obvious, I will also be taking out a lot of the "romantic" moments between Leia and Luke. No kisses on the mouth or cheek, no more Luke awkwardly trying to impress her in ANH "I care". They're friends and I don't think their relationship needs to be any more complicated than that.