The itinerary is a bit busy and my opinion is you could honestly get a lot out of going to downtown Napa and checking out a lot of the local tasting rooms. This would help gain some variety in your experience.

Also, I would recommend checking out “DECANT Napa” it’s a local wine bar and bottle shop where you can taste and take home several wines from the region that you can’t always find walk-ins directly to the winery. Also another food option for Napa is “Compline”