Replace the snap ring. Be sure you have it all the way down. It should "snap" into the groove all the way round its circumference. This is critical for retention of the barrel. If part of the ring is not in the groove it WILL WORK ITS WAY OFF.
Replace the clevis & ring ding. Congratulations, you have finished 1/2 the project.