May be the new layout could look like this?
Here is a rough rendering showing the principle of the layout. On the right, the city building skyline, with relief building along the wall, covering the shadow station on top level. No bridges are installed, no tunnelportals and no water, but hopefully you will have an idea of how I think it could be.
On the lower level you can see the Tehachapi Loop.