I would leave the handguard off and tighten the barrel nut and shoot it like that. Then see if it made a difference before I went through all that.
I use rails that clamp on so I never messed with having to time stuff.
Are you shooting off of sandbags?
Your soft point ammo sometimes deforms off the feed ramps. That could account for the wider groups.