you could just machine the dogs off the bayo lug, so that a bayonet couldn't be attached, but still aesthetically pleasing. Then if the ban sunsetted, spot weld some steel back on it and grind them back to original. Whole lot simpler just to replace the whole sight base though.
You can keep the threaded barrel if you attach a screw-on muzzle brake, then drill and pin it, weld over the pinhole; many postban brakes are attached that way. If the ban sunsets, you can mill the brake down to and around the pin, then remove it with pliers, unscrew the muzzle brake, and replace it with a flash hider. It will ruin the brake, but at that point a small loss. At least you wouldn't have to cut threads in the barrel like you would if it was a post ban, if the AW Ban does sunset. Oh, and you can get new pre-ban config uppers, from places like CMMG and model1sales.com