Both are good options
Visiting & staying in the Barossa and a day trip to McLaren Vale would be my preference, compared to driving to/from Adelaide
For option 2 McLaren Vale is to the south of the airport. Barossa (north of the city) to the airport, means going through the city. Swapping the days for Barossa & McLaren Vale would make driving to the airport a little simpler/quicker. But Adelaide is not a big city and the airport is close to the city centre (6km to the west).
Plesse do not drink & drive. Drivers can be breath tested for alcohol at any time
Edit
OP's other thread--->
https://www.flyertalk.com/forum/dini...s-regions.html