I think they should have let Leia go in episode 8 when she was vented into space. She dies there, purple hair lady then moves into Leias roles (supposedly, Leia was going to have a bigger role in episode 9, so having purple hair lady be the Leia figure keeps those plans in episode 9 open). Then, you keep Luke alive. Essentially, instead of having him disappear in the sunset, he just has a moment of accomplishment and a sense of wanting to get back into the fight. Start the ending credits. Then you have an end credit scene with luke trying to lift his X-wing from the water (maybe fails the first time as a joke) and gets it on to the ground; end movie. Then in episode 9, he with the other resistance members.
I think all of this could have been done without any major rewrites or reshoots of the movie.
I like that.
Unfortunately, I was thinking about this the other day-- "Harimad, why doesn't DC have end credit cutscenes for their movies?" I realized it's because DC doesn't have a plan for where they're going, and that's why their movies are collectively terrible.
Then I took it a bit further, and realized that the present incarnation of Star Wars suffers from the same lack of a roadmap. I don't think their directors have any kind of overall storyboard that is being followed. That's why Marvel's movies work so well, and that's why they can have end-credit cutscenes. Because they know what's happening next.