I've been remiss on checking on responses, will do so much more often in the future. Haven't done anything about fixing the switch yet, but will attempt to give the spray a try.

Cheers, Nor. 18 year old McAllan still my current favorite, along with a Padron Anniversaire. Sweet.