Slipping at Gym

After a Year, my N+ with 3 curved ring slipped today at the gym. In addition my cock has this issue of getting stuck in the cage and not sitting correctly in the head area. My idea is to go to the N+ narrow and 2 curved ring. I like the curve and length and thinking this will help. Any other suggestions?