It sounds like you' re after improved accuracy above all else. If that' s true the add a heavy bull type barrel. The heavier barrel will provide less whip action and heat more slowly when shot. Going to a 5/6 contour will help but strictly from an accuracy perspective I would go heavier.