Don't forget the very excellent session/singaround at Uisge Beatha, Woodlands Road, Glasgow from 6pm until midnight. Get there early to be sure to get a seat!
I'd endorse the two Edinburgh sessions mentioned previously too.
Have a great time,
Wendy