I'm lost on your actual question.
If you are concerned with a barrel fitting a stock, don't.
You are talking about changing barrels for crying out loud. If that proposition isn't daunting to you, then buying $0.20 worth of sandpaper to make sure it does fit should be the least of your problems.