I'm far from an expert on the brace situation but I would think that any modification to one that made it more comfortable to shoot in a shouldered position would be looked down upon by the ATF. Form 1s have been coming back pretty quick you could go the SBR route and put the regular stock from the fix on it and resolve your issues.