I have been doing the same thing. I still have plenty left from the last shortage except for a couple powders that I have gotten recently. Good to go !
Yep, it's a good thing to stock up on the necessary goodies,,, just in case. I recently found a few bricks of Federal SP primers, and added a 3rd 8 lb jug of Unique to my shelf.