Also:
I checked out the shots of SF in TMP, and it looks like the Headquarters building wouldn't be seen, but parts of Starfleet Academy might, if we wanted to add them... Just for overdoing it's sake. ;-)
And take your time on the rough cut. We're fine bouncing around over here!