Your understanding of the AR modifications seems spot on – pinning the stock and replacing the flash hider with a pinned/welded muzzle brake should keep you in the clear. For the "Other/Non-NFA firearms," ensuring the barrel is at least 12.5" and adding a vertical foregrip should comply with NJ regulations.