I revisted the Type-S deck plans again...
This has the drives the correct volume and has the crew spaces arranged better. There's a common in a gallery above the crew deck with the cargo bay and air-raft forward of the staterooms.
Because of the odd shape I decided to break conventional canon and make it a tail-dragger! The two main gear legs go forward and the rear is supported by a reinforced point on the tail.
The rearranging of the machinery also let me ditch the little blisters.
