Tuning Are Weihrauch breakbarrel barrels interchangable?

I'm considering getting an HW90 in .22 to match my other .22 rifles. AoA only has it in .17.. Airgun Megastore has an HW90 .22 barrel and breech block for a reasonable price. I did notice that Pomona Airguns lists an RX2 for sale. However, my wife may not approve of that impact to the family wallet!

So my other question is if anyone has run into fitting problems when switching Weihrauch barrels. 

Having worked in manufacturing, I know that replacement parts are often not a drop-in item. The factory can correct for tolerance buildup by custom fitting from a bin of parts, but that's not feasible for an aftermarket installer. 

Barrel block length must be very accurate otherwise you can get barrel droop. That's probably why the ASP20 has the wedgelock barrel block. I checked my HW30 and HW95, They don't seem to have any droop. The barrel blocks are shimmed on the sides, but I can cut my own shims from stock. 

Any thoughts?






 
Cant speak for newer models but back in the day the Beeman and Weihrauch break barrels were interchangable in many models such as R1 and R10 etc. Buying site unseen is a gamble but if you could do a side by side comparison you could tell. Side to side shims are not an issue it is the hinge point center to breech distance that is critical. Most that I have ever checked have been right on as long as your not comparing an R1 barrel to an HW30 barrel. If I can recomend, be sure to go with a carbine length barrel, performance will be better but a little stiffer cocking effort. 
 
@thumper

Tapping for a set screw is a very good idea. I just might do it.

The factory Weihrauch cocking rivet OD is 4.99mm. 5mm precision ground drill rod is relatively inexpensive and easy to work with. You could get O1 and harden it. If you really want to prevent galling, you can get precision 5mm carbide rod, I saw some online for just $2.90 for a 50mm long piece. The problem is how to cut it.

https://www.ebay.com/itm/362727931859?hash=item547444ffd3:g:h~gAAOSw2-9dVqVK

LOL - Although the stock pin seems to wear pretty well!