New strap or clasp?

Hi all, just bought a CAU2012.FT6038, which is fantastic.... except for one thing. The clasp is complete rubbish and I can tell from just a few minutes wear that I'm going to have to change it because straight away it's doing the same as the FT6024 strap on my other F1, digging into and irritating my wrist.

So, it seems the obvious answer is a BT0717 22mm buckle/strap like the (20mm) one I bought for my WAH1110, but is there a clasp available I could use with the existing strap? I'd rather keep the existing strap if possible as it's quite cool looking.

Thanks in advance for any advice.

Just had a quote from a TAG stockist for a BT0717 which is £48, sounds fine to me, but I'd still like to replace the clasp if I can.