The market hasn't changed since 1986. All the forces you mention were in it since then. The market has adjusted already.
Actually, the market changed dramatically several years ago. Trusts.
Before people used trusts to get around the CLEO sign-off they had to set up LLC's or Corporations. This wasn't that big of a problem because a lot more CLEO's would sign off 20 years ago. With use of Trusts, almost anyone can own a machine gun, I think with the exception of folks living in Illinois. The use of trusts has really expanded the NFA market.