Simple answer: just buy Riedel Vinum glasses for when you have a dinner party, they are only about $20 each.
I then keep the Bordeaux Sommelier glasses for myself/gf when needed.
For scotch I prefer a nice, proper rocks glass. Though I usually have my scotch up (or with a splash of water), there is something to be said about enjoying a scotch in a hefty rocks glass. Again, Check out the Riedel.