Those first two ideas are both interesting. I talked elsewhere of combining ESB and ROTJ into one film by taking most of ESB and welding the finale of ROTJ onto the end, accomplished by having Luke be taken prisoner by Vader in Cloud city, being healed in an Imperial facility via bacta tank scene, and being taken to the new Death Star. I’d be interested in hearing your ideas though!

A clarified TLJ is also a good idea. You hit the nail on the head with how the film overexplains everything.