I would 100% rebarrel. Look at the tools needed as an investment and it opens a lot of options in the future. It makes having a 18-20" barrel for a hunting rifle and a 26"+ maybe in a different caliber range gun a 10 minute job. One nice stock, one nice trigger, one nice optic and it's honestly the cheaper way to go for more quality rifles in the safe. It'll also change your thoughts on new rifles in the future. If I can't just order a shouldered profit barrel and have it sent to my house odds are I'm not looking at that action for very long.
+1 on PVA I have been a customer for a long time and have several OBW barrels cut by them. I will say if you are a tinkerer and like to test they probably aren't for you
mine all seem to just shoot sub 3/8" with about any load.