Hi, I had the same problem than you some time ago. I tried everything and finally I decided to buy an aftermarket deployment. Take a look:
The deployment is very very comfortable, 1.000.000 better than the rep. Nevertheless. a few time later and not satisfied with the look of the aftermarket deployment, I decided to create a franken deployment combining the rep buckle and the aftermarket one. Here is the result:
I did the experiment with my Volcano, my Grey Themes and my Montauk Highway. I'm waiting my Chronopassion (unfortunatly with Francisco ) and my just recently bought RB II updated version, to do the same thing. With this franken deployment, the fit and look is perfect in your wrist.