I had a brand new 18" barrel chambered with a match reamer that just would not shoot. Went through months of gyrations trying to sort it. The fix was a used no name 22" barrel out of a friend's used barrel pile.
ETA: I guess that was covered way back on page one. But your solution has merit. Start over. Expensive up front, but...