Two good bets are "The Tass", Cy Laurie's pub on the Royal Mile, (often singers sessions in there), and the "Royal Oak", in Infirmary Street, just south of the Royal Mile (Folk Club night, sessions downstairs, and often a singer/guitarist on upstairs).
love, john