Very welcome news, as the reviews I’ve seen suggest the current product is very basic.
As for the wine; Stag’s Leap is an excellent choice. Frankly I’d be happy if they settled on “Artemis” (which retails around the $100 mark) in the long term. “Armillary” does seem a bit of a stretch to sustain