Now, the only problem is fitting them all in...
I'll watch those "long corridor" episodes and see what to make of them. Here is a mockup of a short and long curved corridor in the engineering hull.
The short corridor works fine for the hangar complex but the long one - ugh
I remember in some episodes they would make a distinction like "engineering, on the lower levels" or "engineering, on or near deck c", etc. I figured Kirk and crew would check with the bridge while in transit on the turbolift which one to go to