Firm believer in the barrel being the heart of the system here but before condemning the BA barrel because it's a BA barrel, what ammunition are you shooting OP? I've read you've tried heavier stuff and light stuff but specifically what does that mean? 55 FMJ, 62 FMJ, 77 OTM, 69 SMK, what brand and bullet weight is giving you these 1.5"+ groups? My point is, if you're shooting mediocre ammunition to start with switching to a different barrel isn't going to magically make it shoot better.
What trigger did the gunshop drop in the lower?
Also, from my perspective the set up could use a little tuning like turning your bipod around the right way so that you can load the bipod a bit and actually take advantage of it. You could also try a cantilever mount to raise the optic a bit and push forward and adding a bag rider to the CTR stock can help it be more stable off a bag.
This one is less than $20:
Improve shooting stability with the Bag Rider V2 for CTR by Subrevtech. Designed for precision shooting, this accessory provides enhanced support and control.
subrevtech.com