I'm sure I answered this identical question on another thread somewhere the other day.
I rang up Rycote in the UK and asked this specific question and the answer was use the 22mm one as the 20mm one would be too tight. If the 22mm one is loose add a ring of Gaffer tape to widen it out (or maybe a ring of heat-shrink? if you don't want the sticky)