I will second that> Pick up a copy of Whats on probably available at The Royal Oak .It tells of all kinds of music all around the area.
Oh yes Sandy Bells is also a must. Pity you miss the Leith Folk club night. Big acts appear at the Pleasance.