Just found this neat website. Its main catchment area is rather far away from where you'll be (Aberfeldy is northwest of Dundee) but there are a bunch of useful links, including folks clubs for Edinburgh & Glasgow, then a sub-page with "more" which I haven't explored. Worth a look, anyway -

http://www.thequaichaberfeldy.co.uk/music/Scottish-Folk-Music-Clubs.htm