Yup it can be done either way. If your stock is in the square, I'd do it now, but take off the excess material on either side of the barrel, not to final dimension, but to lessen the wood you have to drill through. Easier to drill an accurate hole through less wood, than thicker. Less chance of...