Whistle Shops in Edinburgh (or St. Andrews)?

I’m in St. Andrews for a week and a half, with a couple days in Edinburgh. Any leads on where whistles (or flutes) might be sold here?

I haven’t been up for a few years, but Scayles Music, near the university in Edinburgh, used to be good. I’ve just looked up their website, and it appears they’ve now been taken over by Hobgoblin.

This is the location:

https://hobgoblin.com/branches/edinburgh

There may be other great options too – I used to be a regular visitor but have never lived there, so I only know the places I happened to stumble across.