An unfortunate fact of life is that this scenario is going to get worse, not better. It is my belief that ultimately, you (and me) will be ordering online from places like B&H and other large O.S. suppliers. They are generally cheaper and can usually supply faster than local suppliers these days. Sad, but true. I try to support local dealer as I prefer dealing with a person, not a computer, but when I save nearly half the cost of film stock and it arrives at my door 5 days later from N.Y. it is hard to beat. I also think you (and me) will have to consider other brand suppliers as well, just to ensure reasonably consistent supply, from wherever.
Tomorrw, I will probably be in Vanbar's in Cartlon. It will be interesting to observe their stocks.