Here is the nighttime scene for anyone to take a stab at. I’ll edit the prior post to include it:
https://drive.google.com/open?id=1ijkUtOTbBsQu3OChi0hRm9FMjU3tdq0K
I’ll take a look at it and see what I can do. I recall doing some mockups of the scene at sunset, which is easier to achieve than night. Day for night often requires some artificial brightening of just the faces in a scene for it to look at all reasonable.
For the Death Star prototype, have you considered replacing it with some sort of Imperial shipyard constructing their new fleet? That would tie into ANH (“It would take half the Imperial starfleet and more firepower than I’ve…”) and it would save the Death Star reveal for Rogue One. Someone skilled in CGI could probably manage it.
Alternately, if you wanted to keep a very early part of the Death Star construction, maybe you could contact this guy and his brother to see if they could provide you with footage from their already existent model: https://vimeo.com/246936220