More choice, more curiosity — and a new generation of wine drinkers is changing what ends up in the glass.