Does anyone make a Deployant clasp for Panerai that doesn't suck?

[Thurnau]

I hate my PAM 104 deployant clasp. It's curved so great it digs into my wrist.
I bought a Panerai brand normal non-deployant buckle and a couple straps, but now I can't wear the old straps since the deployant buckle is terrible and straps aren't cross compatible.

Should I write off the old straps and buy all new ones?

And also, where would I find replacement screws? I haven't lost any yet, but as tiny as they are I'm afraid I'll strip or lose one.