Cut out “so, you have a twin sister”, replace “your sister” with “the princess”.
It doesn’t sound perfect (last time I did it) but I think it’s better than Luke and Leia being siblings.
Either Lando or Gold Leader. Depends on how much of the Battle of Yavin I’m gonna reincorporate. I was originally leaning towards Gold Leader but now I’m almost certainly gonna do Lando.