Hi Eric, I have not taken the tour, but I can make some suggestions.
First, you are in Edinburgh for two nights. Sandy Bell's over near the University is great. I've been a couple of times and always enjoyed myself. There are other spots, but I've gotten hung up on Sandy Bell's. :)
I don't see anything in Kenmore, but they may have something for you. Sometimes hotel bars have special in the summer.
Inverness has a great place for live traditional (and otherwise) music--Hootananny. And here's another, that I've not been to, but sounds promising--Gellions. Black Friars has live music. I've not been to Johnny Foxes mostly because it seems to be too full of drunken young people, but I may have hit it on a bad time. About ten years ago there was a music museum in Inverness, that sadly closed. But there are other concerts in Inverness, so you should check some of the booking sites for the time of your visit. The Gig Guide and Scottish-Folk-Music.com are both good places to start. Remember though, that this information changes and as you near the time of your visit, you will probably find new gigs and concerts.
You'll find that some pubs and hotel pubs have different things on different nights of the week. For example, The Lorne in Oban has live music on Thursdays per their website. Here's a link to question about music that was posed on TA. One good tip here is to read the local paper or newsletter. Some villages and towns have websites that you should check closer to your travel date.
You aren't going near my favorite, The Taybank in Dunkeld. Maybe you can check it out on another trip. BTW if you are on Facebook, friend or like some the pub's Facebook pages and you'll get update on their music plans.