Great work. The editing is solid, and Luke’s outtakes work really well.
If image quality is a problem, perhaps you can just use the audio over external ship shots.
As for CGI, I do agree that you might want to go with the original effects, as they match outtakes and deleted scenes better.