Should we also consider the wrecked Vico
while we're at it? We know it to be a separate model, but perhaps there is some merit.
We definitely should, since that appears to show a four-deck saucer section that would, in more ways than one, be ALOT more consistent with both the window placement and the act that those shuttle bay doors have to be large enough to accommodate actual shuttlecraft (which are somewhat taller than a full deck anyway) and still leave some clearance to fly in and out.
So a four-deck saucer, two-deck dome, just going by the damage cutaway.