I only have one suggestion for this, but I think it improves the film greatly:
Start the film with Luke on Dagobah
It just makes so much more senseDo you have friends?
How long would you let them hangin on a wall? Weeks? Month? If they survive that long at all.
Luke’s waiting to hear from Lando before he does anything. This is set up at the end of ESB.
In the meantime, nothing’s stopping him from going back to Yoda and it makes more sense that he would.
You can click the link in my sig for my ideal opining to ROTJ.