Since I am a complete doof and saved over my non-subdivided version of the ship model, I decided to make a new one, and this time I kept everything as one object (excluding the bridge, deck 2-4 addition, and the impulse engines)
Here's what I have this time, somewhat different, but mainly the same:
Once I commit the subdivision, I'll be able to cut some of the pieces off and do the more detailed stuff.
And, of course, like the idiot I am, I forgot to redo the graviton shield emitters...