I would build a whole new upper if you're going to replace the barrel. The complete upper will be about $300 more than replacing all the parts on your 6920, plus you get to keep the 6920 together.
If you're replacing the barrel and handguard, you would only need an upper receiver and parts...