I'm going to make another bold suggestion:
COMPLETELY REMOVE ANY mention of Leia and Luke being related. It was ONLY added in to try and "top" the Luke/Vader reveal in ESB, and just screwed up the way things had been going up to that point. It just smacks of being thrown in at the last minute.
I know no one will agree with me, but that's my opinion.