Hi
I'd say you're on the money..
However, you need the 90s Excelsior kit not the reissue, as the saucer was retooled and is different; particularly on the underneath around the neck. My other, hopefully helpful, thoughts are below.
The deckoids are identical whether they're in the Enterprise...