Sounds like you're getting it together.
I'd still be tempted to shoot it before you replace the barrel, if only to see how accurate that original barrel is.
BTW, welcome to the 'Fire! Mostly good people here, but a few that compel me to qualify with the "mostly."
