I'd go free float and a new clamp on or set screw gas block. I've wanted to go back to A2 sights before and it's hard to do when you cut them up.
John 8:12 "I am the light of the world. Whoever follows me will never walk in darkness, but will have the light of life."
| 
