I wouldn't hold my breath waiting for expanded availability of models and configurations that are already unavailable.
We are in an ECONOMIC DEPRESSION. The reason people aren't buying more guns is because many can't even afford basics to sustain life. Raise your hand if you've gotten a meaningful raise lately. If you are self-employed, raise your hand if your roster of paying customers has grown recently - or even held steady. Now raise your hand if all your bills have gone up substantially lately. I can't afford to buy any new guns now, and I don't see that changing any time in the near-term - no matter what the outcome of the upcoming elections.
Expect lay-offs at all levels of US manufacturing, especially at facilities producing goods that are non-necessities. Drop in demand does not mean there will be increased production, let alone increase in new or previously-scarce models. That's not how economics works. Hate to be the bearer of bad news to Mr. Big Paycheck, but that Ruger #1 in 6.5 Swede with the schnabel forearm he's been waiting for just isn't going to get made. That gun is a NON-NECESSITY.
The gun manufacturers will continue to produce only enough supply of mid-priced popular guns to keep - hopefully - in the black. Tooling and running Q/C for fancy stuff that doesn't sell won't keep the lights on.
Same goes for ammo. Price will come down some because demand is dropping sharply. Again, who can pay 50 cents and up for one bang when they can't afford to fill their gas tank? I'm still burning my fair share of ammo - for now. But that's only because most of my ammo is handloaded, and therefore largely un-saleable in the secon-hand market. I might as well enjoy it while it lasts. Ammo manufacturers still have to pay for input costs. Price of ammo will go no lower than the point at which the manufacturers can cover inputs and still eek out a little bit of profit.
If you can afford to spend money on non-necessities, your best bargain today will be in the form of guns and ammo being sacrificed by by people who are struggling to buy basics.