Try going in a completely different direction.

Move up to a mid-length or rifle length gas system and get away from the carbine length system.

That or add a gas block and settle that thing down a bit.

As old as this post is, I'm thinking you already dumped it anyway.

__________________
THIS WE'LL DEFEND ΜΟΛΩΝ ΛΑΒΕ