What if we voice dub Alec Guinness in that scene and make him completely and utterly verbally outclass Vader instead of the “Vader” line and “the duel”?
Something like:
“Hey, Anakin. I see your helmet is keeping your burned face from scaring away the imperial women”.
And then Vader goes straight for the kill, as Obi-Wan gives Luke a comfortable blink with the eye, before accepting his fate like a champ? All while Battle of the Heroes is roaring in the surround channels.