If it were me I would start with the barrel, if you are going to keep the same contour barrel you could drop it into the factory stock and continue shooting it until you figure out what stock and from whom, you wood like to put on.