I understand a bit better now. I don't necessarily agree with your logic (My read is that if they go after anything, it will be magazines or the entire rifle - no grandfathering), but if that is the path you are on I won't try to talk you off of it. I will tell you that I started USPSA (and thinking about 3 gun) in 1996. MAGS were the limiting factor. Unless you had lucked into some pre-bans or were willing to commit a crime, you were limited to paying $100/mag to get one with the right date code. If history is a guide, start buying PMAGs. Buy a few 20's a few 40's, maybe a D60, and as many 30's as you can. Why the PMAGs? They are durable, but they are also the mag everyone makes accessories for. Extensions, baseplates, couplers, etc. You can run other mags as well, but there is a reason most guys get into PMAGs.
If you are serious about 3 gun, I understand building an upper to be your "game" gun. Not a bad plan. I will go out on a limb and tell you that most likely you won't like the same upper in a year, but that is part of the process.
Again, there is nothing wrong with your current upper as a general-purpose rifle. But you could make some changes to have a more competitive rifle. A more accurate barrel, a slimmer handguard, and a more effective muzzle device for controlling rise would all help.
IMHO, the heart of the upper is the barrel. Nothing wrong with BCM barrels, but there are other choices out there that may (note I said *may*) improve your rifle's performance. I like Nordic Component's 18" rifle gas barrel, but it can get heavy after a fast stage. I also like the Stretch 16 barrel from Strong Side Tactical. You'll also hear proponents of Odin Works, Black Rain Ordnance, Noveske, JP, White Oak Armament, etc. I know that my barrel is more capable than I am, and that is what is important. But when I was running a Burris MTAC, you could forget shooting groups - the center do was over 2MOA, making group shooting difficult.
If I was building a 3 gun upper now, I would look long and hard at the LaRue barrels - he's got them marked down to $225 for the rest of the year. You'll be hard pressed to find a better barrel at a lower price. I'd get one with M4 cuts, and then make sure I got an M4 upper. Speaking of which, pickings are slim right now but I've always been happy with BCM for uppers and bolts. Some competitors run low mass bolts, TiN or other coatings. I can honestly say I've never been in a situation where I was out-running my rifle, and therefore don't see the need. I just run a plain BCM bolt, knowing I can get replacement parts easily.
Brakes are kind of a personal thing. The DPMS Jerry is incredibly effective. On my 18" Nordic barrel, the center dot did not appear to move. Felt recoil was far lower than my standard 16" midlength. Others that you'll see talked about are the Rolling Thunder or the SJC Titan. I went with a Dynamic Resistance from Carbon Arms for the latest rifle and have been pleased. Not quite as effective as the Jerry, but also not as offensive.
Handguards are a personal choice. On a 3-gun rifle, the handguard doesn't do a whole lot other than stay off the barrel. Occasionally you may get to put your sling on the rifle, but I've seen that in about 1 out of 10 matches I have shot. Something that is comfortable but has enough ventilation and mass to deal with heat is nice. I've used Troy (never again) and Midwest Industries, but there are a ton of manufacturers out there. Find one you like, make sure it will clear your gas block, and be happy.
Optics are interesting, and very much dictated by where you are going to shoot. If all you are shooting is in pistol bays, an Aimpoint or EoTech may be all you need to go fast. If your Match Director has a thing for clay pigeons at 100 yards, you may want to start looking at magnified optics.
Again, nothing wrong with building an upper for the game. Do your homework, search Brian Enos' site. Buy smart and even if this doesn't end up being your long-term 3-gun upper it will make a hell of a recce.