For the saber toss, I remember there was a much more dramatic take of that from the documentary. It seamed to really fit with the TFA ending. The issue was the string holding the saber being visible, and that Luke’s hand was pre-CG.
I think a combination of the the footage here, the original, and the early teaser, would make for a more serious and dramatic version of the scene.
https://youtu.be/v6AJp5VLCdI (0:21)