^^ Since you mentioned TAS I'd like to mention that I evaluated its sickbay scenes (i.e. several beds next to straight wall, several beds extremely close together, different doctor's office with larger big table and bigger viewscreen) where the rooms have an outspoken rectangular nature.
Anything that is rectangular is, of course, "good news" for the engineering hull, so I'm tempted to locate some of these there.
Apparently these rectangular rooms also connect to a circular corridor...
I believe the window proportions of the engineering hull windows (compared to the saucer ones) and its shuttlebay tell us that we do have a horizontal deck alignment throughout the ship.