Most likely, you can just get a 16" upper can move on (I would swap the SBA3 for a stock if I was going rifle)...but...keep in mind that when the proposal hits, one thing you can do is simply pop off the SBA3 while you wait for all the lawsuit to take place. It will stay a "pistol" that way.
Before you go buying new parts, read a lot of the FAQ's on the site because there are a lot of terms that can be confusing at first.
For instance, the legal definition of a rifle is a lot different than getting a rifle length buffer tube (or rifle length gas system). You don't want a rifle length buffer tube unless you are going with an 18 or 20" barrel. When we say "rifle" upper.....for an AR15, it is in the legal sense. So must of us are talking 16" barrels (or 14.7/5" pin and welds) with carbine buffer tubes, carbine buffer weight, and either carbine or mid-gas length gas systems. It can all get confusing if new, so just chill for now and read up, before you start spending any money.