The obvious is John Dickson, but then I expect you know that. Edinburgh is a lovely city, but I haven't visited other gun shops. Another interesting visit at Leith (3 miles away) is the Royal Yacht Britannia, which you can visit and see round.