Around here ammo is starting to make a very slow but gradual come back. No 22LR but I am seeing 9MM, 40S&W, 45 ACP, 38 SPL, and 357 in stock in some mom and pop stores as well as Walmart. Both range ammo and self defense. Hopefully it's a good sign.
I say put your money aside and wait. I'll happen. Just be patient.