Unless the suppressor is blind-pinned or welded to the barrel (which is the same procedure required for a permanent flash-hider adding length), then you need a separate stamp for the SBR.
The barrel doesn't have to be "all barrel" to get to the 16" minimum length--it can be suppressor or flash hider. But it does have to be permanently attached to the ATF's satisfaction, which means blind pinning or welding. It can't just unscrew.
Aaron