Scottish ale is a bit of an american/BJCP invention

Pale'n'hoppy have been the most popular scottish ales for two decades, older 60/70/80 etc almost died out along with most of the brewing industry as the big boys took over and lager was so popular
My favourite pubs in Edinburgh are
The Stockbridge Tap - good modern cask and keg
Cloisters - ditto
Bow Bar - good whisky too
More trad pubs - Kays, Old Bell, Blue Blazer, port o leith, Cafe Royale (more for the decor than the beer) Guilford Arms, Abbotsford, Bennets, The Cambridge bar and the Oxford bar
Newer ones that might not have been there last time you were there
Salthorse - this will be new for you, opened a couple of months ago, shop+bar
Ushers - modern craft kegs
Other places - Jeremiah's Taproom, OX184, The Southern, Red Squirrel
edit, mentioned most but theres a few other places in these lists
http://thisisedinburgh.com/blog/top-10-craft-beer-bars-in-edinburgh/
https://www.timeout.com/edinburgh/bars-pubs/the-best-craft-beer-bars-in-edinburgh
http://www.theguardian.com/travel/2014/aug/01/top-10-craft-beer-pubs-in-edinburgh
probably a bunch of others too, I don't live there anymore and only visit every few months
CAn't help you with the other places.
Have a good trip