This is looking fantastic. Sadly no matter how much editing people put into TROS, the only way to end with a genuinely great movie is by doing what you’re doing.
Now you had mentioned having the two halves of Luke’s lightsaber which would be amazing. The link below contains images of a fan made version of the split saber. I’m not technically minded when it comes to this but I feel like the plain backgrounds would make it fairly easy to place into the shots in question with a little work.
I just wish I had the know how to help.
Thanks, I appreciate the support! 😄