Regarding the continuity issue with the Cloud City fly-through/Leia apartment shots, could you simply do something like this ady?

With Leia's building lowered and the cloud car platform moved to the foreground a bit more, it seems to jive with the shot that follows it, no?

Even if the continuity were fixed by doing this, I realize lowering the apartment may not look too good in terms of composition. I suppose some background buildings could be added, though, just to balance the shot out.