Is the issue really the hand-guard or the barrel? Perhaps you'll need a thinner profile barrel under the hand-guard, too.