I don’t see a way of fitting everything together, but how do you imagine it?
Well, it’s not simple but, I think I know of a way to make it work.
The Battle of Yavin would serve as the actual finale, there-by overriding the Battle of Endor.
The Rebellion most-likely stays on Yavin IV, in order for the finale to fit in. Han Solo’s
freezing in carbonite, isn’t fully decided. Somewhere, the training of Luke by Yoda would fit in
sometime after leaving the Death Star. Luke most-likely won’t loose his father’s lightsaber.
Do note that, this fan-edit is not intended to fit into the Canon Skywalker Saga Timeline.