Dude, just do some homework yourself, go to the range and test that bad boy out. Get some glass on there. Get all bagged up and prone or on a bench. And bring several different types of ammo. I'm betting that barrel can shoot pretty well. But it sounds like you haven't even tried.
My Colt A2 CL 1/7 NATO chambered 20" govt style picky barrel will consistently shoot 2 MOA (5 shots) with the right kind of ammo. Mainly 52 grain and 77 grain Black hills. From what I can tell. The trigger is also a heavy Son of a Gun. That's with a scope mounted on the handle. I'd post pics, but snapfish isn't really working. I'll try though.
But regardless of if you believe me or not, you should really find out what your current set up will do now. Why mess with getting something new if you don't need to. I highly recommend ADCO and WOA but you might find out that your barrel is a tack driver already. All you've got to lose is time, some fun, and some ammo. Or you may want to see if a better trigger is a better first mod. But without trying first, you're no better off than with a brand spanking new match barrel. Well, maybe a little better off, but like I said, what have you got to lose.
FWIW, I have a WOA barreled recce that was built by ADCO that shoots much better than what I posted above