I wound up not doing the tour that Beth mentions, but instead took the train to Edinburgh and using the HoHo (hop on-hop off) bus. The rain made hopping off a little less than desirable, but once the rain stopped, it was enjoyable. Edinburgh is clearly a place that demands an extended stay to really experience the place.
Alas, I could not fit in a Fringe Festival performance, but hope to come back during this season and enjoy that.
Onward to the highlands and Scotch!