Absolutely, you need to be dealing with a specialty vendor that understands their own supply chain. I’ve had good experiences with batteryspace.com (AA Portable Power). Not affiliated.
Amazon’s logistics advantage is huge, but unless I absolutely need it tomorrow they’re rarely the best option. Oddly enough, there are a few resellers of marked up Chinese electronics that have established a certain amount of brand trust with me - “DROK” and “SMAKN” come to mind. Brands that provide a reasonable amount of curation to help you avoid the absolute worst crap, but are small enough not to attract counterfieters themselves. It’s an odd niche that Amazon’s failure of inventory control has created.