Your o-ring list looks like it will cover it.I got my 1st P17 yesterday - so I did the checking of the compression tube air inlet hole - looked and felt smooth.I polished it anyway with 7000 grit polishing paper - cleaned and re-lubed everything before 1st shot.The only thing on my P17 is the compression tube o-ring is not exactly #116 nor #117 - close but original is a little thicker.I re-assembled with original o-ring and gun shoots good - chrono at 410 FPS with Crosman 7.9g