An idea popped in there.
Never liked Yoda’s death scene.
So imagine Luke has just rescued Han. Luke announces to the audience his intention to return to Yoda. We see the swamps of Dagobah Yoda is meditating. We hear engines and see an out of focus ship land behind him. “I sensed you coming old friend. The time has come. One last lesson have I” It’s not Luke. A red Saber ignites, Vader’s breath. “I will teach you to die”. When Luke gets back Yoda is one with the Force. His hut is smoldering ruins. The dialogue with Ben’s ghost continues as before.