In reply to Jon Stewart:
Hi Haydn!
Other options near Edinburgh are Aberdour sea cliffs (you could do Pain Pillar VS, the local classic), Limekilns, Traprain Law (bit polished in places), and sport crag North Berwick Law which is 20 min on the train from Edinburgh Waverley (the main station). All venues you could go to for a short day if you need to be eating out/ doing holiday stuff with your wife of an evening.
Agree with an earlierpost about Dunkeld (and the village of Dunkeld is great, lovely riverside pub, places to eat, local walks).
Other cheeky option from Edinburgh is cross the border into Northumberland - 90 min drive to Kyloe, Bowden, and a couple of other places - short routes often packing a bit of a punch, very much the local style!
I'm afraid I may be a bit tied up when you visit, but who knows? Plenty of climbing walls in Edinburgh and nearby if weather rubbish or you geta cheeky couple of hours! New one due to open AS YOU ARRIVE (Alien Bloc).
Enjoy your tour!