While at the subject of whisky: i visited MacAllan some years ago.
Very nice personal tour with a small group (we had the B&B lady arrange it, after hearing in the local pub we really should visit that one)
They even let us take a peek in the tasting/blending room.
And i used to think i didn't like whisky, but i loved the taste of theirs.
http://www.themacallan.com
What a difference that was to the tour and the taste of glenfidichchh.

Not visiting Edinburgh? Really nice city (the old centre that is)
We were there during the fringe: http://www.edfringe.com/
And we earned an 'i survived the eerie pub tour' shirt: http://www.fabuloustravel.com/ww/eeriescot/eerieccott.html

Photo's: (looking a bit weird, salvaged with gimp, camera had a light leak) http://www.xs4all.nl/~schido/fotos/schotland/index.html