Fenix 5 strap buckle catcher

Hey all - recent new owner of a F5 sapphire. Absolutely love it, just one thing that is really annoying me - more so after reading someone else complaining about it too.

The metal buckle catcher on the standard strap (both black and yellow) is digging into my wrist quite a bit and gets pretty sore, especially when cycling. I can see that the Forerunner 935 has a similar strap but with a less prominent silver buckle which looks a lot comfier - does anyone know if there's a 3rd party selling these quick fit bands with the forerunner type buckle instead?

And has anyone else here noticed this with the straps?


Thanks,