Great find on the upper door! Now we can correctly plot Kirk's (extremely long winded) route around the upper level.
A stern corridor for the upper level is tempting, but would there be enough space back there to justifiy all the traffic of personnel that we see?
You're right, space gets tricky back there. I'll mock up something so you can visualize how much space there is sometime today.