Be sure to include the southern uplands, including Border reivers and Burns country too and spend a few nights in Dumfries, chez Pour1Malt. I always think Edinburgh is overrated as a tourist destination and that Glasgow is a much more interesting city.