I'm going to try to get an early start on my day (Sunday) at Fushimi Inari or another shrine/temple for early morning, then head towards Yamazaki around 9am. I'll try to pick up a bottle if they have it available, and maybe a tasting glass before getting on with my sightseeing and whisky hunting.

Thanks for the tips.