I think either of the ones you listed should fit. TBH, the plastic threads inside are pretty soft so sometimes you can "force" them to fit anyway.