Rather than spend a whole bunch of time and effort on another iteration of the 3D model, I decided to do some 2D layouts instead. Here's what I have so far for the top view:
Obviously this isn't finished, but it should provide some clues to where I'm headed, especially with the primary hull.
More to come in the next day or two.