I don’t know that I’m able to help with the editing on this project, but I’m very interested in your work here, especially what you’re doing with those deleted scenes!
My biggest concern is the haloing in Chateau Picard scene, which is affecting the green screen replacement and the overall quality. You can see it in this screenshot around Data´s head for example. It can be fixed with Photoshop but is a hard work frame by frame and I´m not an expert using that software.