I think you've improved the look by lengthening the hull. As far as windows, are you going to cut them out or just use a texture? That's one thing that has kept me from attempting TNG era stuff, all those windows....

I´m manually cutting them. Proboolean, now a native plugin, does the task a bit more easy, but not simple. Other way is to cut (editable polly) the windows using a spline behind the mesh as a guide. It´s to much tedious, but produces a much more precise and clean mesh. I´m mixing the two options, using one or other depending where the cut is done.