I don’t swap barrels around much anymore either and like to keep my setups together once I’m really pleased. I agree with the oversized pins, though I’ve only needed them on a rare occasion. I’ve been through alot of barrels over the years and have really reduced the number that I have now. Most of the time POI has not moved much, if any, but a grip and forend change has shown the biggest results for me as well. Most recently I had a GA Jim laminated set on a G2 and swapped them out for a Pachmayr set, resulting in my group moving 3” to the left and the same upward. I’ve never taken for granted that the POI will be right where it was prior to swapping anything around and always confirm where it’s at prior to hunting.