You said this bike already had the o ring mod, but did you physically take it apart and check? Those orings only last so long before they break apart from the stress and most people just use safety wire now. My oring just broke again and i have the exact same issue as you for the 2nd time