I am converting a 6mmBR benchrest rifle to 0.222 Remington. Will order new large shank barrel, then change the bolt face to a 0.223 version and .223 bolt short action bolt baffle. This is all I believe I need to do. Any thing I am missing?? I know I need 0.222 gauges as well for headspace adjustment