Here is a more careful placement of the ports and a change in deck alignment. I also whited out all of Kimble's details where I have changed them. While the airlock does not line up to the deck and the deck does not line up with the hanger deck, this all makes perfect sense. The airlock would need to be tilted (hey, they have artificial gravity so its no big deal to change up by 6 degrees) and the deck is never shown meeting the hanger deck, only seeming to. And it works with the TOS plan. And I also fixed the warp shaft (except at the very top of the engine).
And since I haven't posted it before, here is the cutaway (with all the callouts) poster. Forgive the creases, it is 40 years old after all.

And since I haven't posted it before, here is the cutaway (with all the callouts) poster. Forgive the creases, it is 40 years old after all.
