An Origin (or other Zermatt actions) will be your best option. Easy bolt head changes and plenty of options. With the Savage style threads you'll also have the most barrel options at a reasonable price.
So there's a lot of other companies out their that offer their own propriety switch barrel...