Regalight flicker / contact issues?

I have a new Regalight WT1 and am running AW's 18650 2200 mAh cell in it. I've thoroughly cleaned and relubed all the O rings and threads and have fully charged the new battery. I am noticing though especially right after reinstalling the battery that the light wont turn on right away often until after a few clicks. The light seems to flicker as well at times like it's losing contact somewhere. I've changed the tactical switch out for the dual mode switch and it still is doing this.

Is this the correct battery for this or is there something beyond my control that is the problem? Any advice would be appreciated. Otherwise I'll have to exchange this light and wait for a replacement.

Thanks,
Dan