So you did everything right^
Regarding wine as someone who drink alcohol itīs of course not my world. But I fully understand that such a tour must be heaven for every wine-fan.
P.S. Whatīs luxury depends - for one itīs the car with driver, for the other a Ferrari to drive yourself and for others simpl a few minutes for themself. And thatīs one of the things which makes life so interesting.