Well looking at the zoomed in shot of the side/view of the saucer section, while I don't have my resources at hand, the top part does look a bit bulgy (top heavy) as if it should be reduced a bit.
Don't forget that CAD files and such for ships, aircraft and esspecially vehicle layouts are never 100% accurate, due to perspective. Homes and buildings arn't so bad as they're mostly square and easy to calculate, but when you have something with a lot of curves and round points at various depths, things are not always going to line up perfectly.
I only know this due to the various CAD files I deal with in regards to buildings and signage.... not to mention our digital auto library files for all the vehicle models we work on have never been exact, off on a few measurements, or have parts that shouldn't be there or just not on the actual vehicle we're working on.
So in other words, you can only go by the CAD / Profile layouts so much before a little bit of human creativity is required to make it all fit...... AKA: I'd suggest reducing your top a little bit more to accommodate the known decks.
And from my memory of Ten Forward, the windows were all shaped as though it was on the bottom half of the saucer.
^ Based on the layout, it would appear to be the deck directly starting on the bottom half, and if that is considered deck 11, then something's a foot...... perhaps even an ear.