Personally FWIW, I would sack off GT, Golspie etc unless the weather is pants.
Natural stuff for me in preference. If you went to a great climbing location would you only focus on climbing walls unless its crap weather ?
Laggan / Aviemore, always excellent with loads to do from The Burma Rd to around Rowardean/Glen Feshie., Fort William loads of options and the Devils Staircase is great, Ciaran path having done it once, I would miss that too, I reckon its over rated and do the off road descent from Loch Eilde Mor (spelling), back to KLL instead. This runs parallel to the south of the 4wd track from Mamore lodge. Great hostel near the ice factory.
Braemar and Habitat (hostel not the shop) gives access to Balmoral estate, Lochnagar, Mt Keen, Loch Muick…. great natural riding and big big scenery
Need a map and whisky planning session I reckon… and if your stuck in edinburgh, give us a shout.