Tuning Hatsan BT65 SB QE Carnivore .30 cal O-Rings?

I recently bought a used Hatsan BT65 SB QE Carnivore .30 cal. It is the older bolt version, not side lever. It shot fine but the cylinder started leaking badly. The offending o-ring is #2316 on the valve housing.

I want to order a complete set of o-rings from oringsandmore so I first did a search of AGN, other forums, and YouTube for the sizes. Some of what I found for BT65's would fit my .30 cal gun but many of the sizes I found definitely would not..

I have started measuring all the o-rings and/or the groves. However, I have no idea if the rings now in the gun are the correct original size.

I am not quite finished but here are the measurements I have made (or guessed) so far. The part numbers are from Hatsan’s exploded view:

2302 - 14.0 x 1.78mm

2304 - 5.28 x 1.78mm

2305 - 23.0 x 2.50mm (Inlet valve, rear)

Not numbered - 25.0 x 1.5mm (Inlet valve, front)

2316 - 25.0 x 2.5mm

2324 - 5.28 x 1.78mm

2335 - 11.5 x 1.0mm, not yet measured

2337 - 18.0 x 2.5mm

2338 - 13.0 x 2.5mm

2340 - 3.0 x 1.0mm

2342 - 28.0 x 1.5mm

2426 - Transfer port, not yet measured

2608 - 11.0 x 1.5mm - Barrel not yet measured

2609 - 7.65 x 1.78mm

2690 - 12.0 x 2.0mm

Before I order, I would like input from some of you guys. Can anyone confirm or correct the sizes above?