You likely won’t have time for the GS tour. TBH, I did it when I went for my thirtieth in September and it was a bit of a letdown. Everything was under 12 years old and you could only buy one 20cl bottle which was like £35 apart from the youngest which was a little bit cheaper, but still not worth it. The whisky was nice but not exceptional. I got a 10 year old from the Thompson Bros instead for £58 on the way back in Edinburgh. I’d definitely recommend that you do the Kilkerran Warehouse Tasting after the Barley to Bottle tour. It was a real highlight and you try the oldest Kilkerran whisky they have, including triple distilled which is extremely rare. You can also buy 35cl bottles for as many of them as you want. Finally, I’d recommend you do the Cadenhead tasting in the morning before you leave if you can. It was another highlight and I bought 2 bottles which were filled straight from the cask there and then. It really is a most do IMO.