Have you been in to Edinburgh Rifles? Just off the bypass.
Tiny shop compared to Cluny but a very different experience. Really friendly and approachable. Not exactly far from you and even a browse and mounting lots of different guns/makes would be helpful to see what feels good? I got a 525...