Give the west end brasserie a shot too if you're still in town. Literally across the street from the Johnnie Walker experience (the experience/tasting isn't worth the price in my opinion, but the bar is cool). Maybe my favorite city ever.
Me too. And add the botanical gardens to your list if they weren't already on it. It wasn't on mine initially but we spent half a day there and only left because we had reservations for the JW whiskey tasting.