I realise this is short notice but I was driving through the village of Aigle this morning and noticed posters for a wine fair they are holding today from 10:00 to 18:00 in the old town. You buy a glass for CHF 15 and then wander around the stall of 17 Aigle wine producers to taste their selection of wines all for free. If you wish you can then order and they will post the wine to you. It's about 10 mins walk from Aigle gare.
www.aigle-verre-en-main.ch