Airbrush Luke out of the Yavin celebration. Make it so the death star blows up and instantly kills luke too.
The sequel trilogy then becomes about finding the ghost of Luke and Rey’s unreasonable demand that he come out of ghost retirement to save the galaxy and then give up his ghost body to truly dissolve into the Force, before inexplicably returning for one scene.
JEDIT: I suddenly realize that this is actually a really interesting idea, or a version of it where Luke dies in the scene where he tries to kill Ben.