I hate to say this, but "none of the above". I'm sorry Vektor, but I think the original saucer "flowed" better than this latest iteration or any of its variations.
If I were rethinking the Grandeur, the only thing I would consider changing is the deflector area to make it "flow" a bit more organically up the face of the saucer, like so:
Other than this, I think you had a jim-dandy original design beforehand.
If I were rethinking the Grandeur, the only thing I would consider changing is the deflector area to make it "flow" a bit more organically up the face of the saucer, like so:

Other than this, I think you had a jim-dandy original design beforehand.