Back to the original questions: To get some advice on modifying your 21 into a suitable sporting gun, we would have to know what the chokes and stock dimensions are now.