Consider an H1 or carbine buffer. The fitment problems where You need to pull the charging handle again can be a results of the locking bar. If I had been you, I'd acquire my trigger out from the higher and find out When your spring is bent. I would wager dollars that it is. Shifting gears- S