Yes, I change all pieces without changing the barrel. My gunsmith did the work. I use an old hand guard from a GMR-15. The new vertical comp ”pin”/weld but a set screw hidden inside for an easy change if needed.
I use these parts. This combo is super effective.
1) Smalley wave spring C100-H8
https://www.smalley.com/request-retaining-ring-and-wave-spring-samples
2) Kynshot RB5015HD
3) Strike Industries AR-10 Flat Wire Spring
4) A coin on top of wave spring