Hi, below is my list of good whisky bars in Edinburgh:
Bow Bar- Victoria Street, in the heart of the Old Town and close to Whisky Shops. Range of OB's and IB's from Signatory, Cadenhead and Douglas Laing. Not really a food pub but a must for real ale fans.
Canny Man- Morningside Road, a real crazy pub with wacky decor, beer garden, resident cat and even a casino. Loads of malts and other spirits ie rums. old G+M bottles and OB's. Serves food. A favourite for Charlie Mac, probably need a taxi from city centre.
Albanach- Royal Mile, a new bar on the corner of Cockburn st. All OBs but do have old Bunnahabhains, Bruichladdichs, Lord of Isles and Laga 25. A more modern interior and a restaurant to the rear, a good stop for food.
Malt Shovel- Cockburn St, A wide range of OBs and G+M bottles. Good prices and pub food.
Teuchters- William Street, OBs but some old and de-listed bottlings. Restraunt downstairs, another to visit for food.
Malt and Hops- The Shore. Good selection of whisky and ales if you are in Leith
The Vaults- still in leith, SMWS, all their own stuff and good drams they tend to be.
Mathers- West End, OBs and G+M. Not a food pub.
Whisky Heritage Centre- Royal Mile, all OBs but some good old age whiskies and whisky cocktails. Amber restraunt attached for good food.