There's a lot to love about SSWR's last lesson mockup.
To those who think it spoils the reveal at Jabba's Palace as I said before the reveal is already broken in the theatrical cut where the mysterious powerful looking Jedi falls down the first trapdoor.
To build a more interesting last lesson it may be fun to mirror the very first lesson.
Remember Luke deflecting remote blasts with his sabre?
If Vader can deflect Han's bolts with the Force alone it would prove that Luke has stepped up a notch if he learned to do it too (totally useless against the power of Palpatine's Force Lightning but he did say they were feeble skills).
Here's how I see it.
Sinister music (something like The Magic Tree from ESB).
A mysterious hooded figure approaches Yoda's house.
A couple of remotes activate and he effortlessly deflects their blasts against them using only the Force (no saber yet).
Is Yoda safe? Who is this sinister chap?
He lifts his hood to reveal Luke Skywalker Jedi Knight.
Yoda sitting on a log congratulates him and then coughs, Luke looks concerned.
Then the scene inside.
That way you can start the film (from Luke's end) on Dagobah and still have the mysterious intro, a final lesson that mirrors the first and sets up a scene at the end.
Is it doable?
"I'm just making this up as I go along"