It is a shame that the fake market makes shopping for "real" 18650 cells practically impossible. The 18650's are so convenient for small flash light and little electronic gadgets that one can cook up.
With the more modern (slim) laptops, they already moved away from using 18650's. So even the re-packed/re-skined battery market will have a sourcing problem. I suppose consumer 18650 market is or will be a thing of the past.
In the UK there are several battery suppliers with eshops, which look to sell genuine 18650s and other Li-ion cells by major makers. Prices range from £4 to £8 depending on what you want. They seem to be long term businesses, not fly-by-nights selling a load of rubbish and legging it. There must be similar on-line stores in the USA.
There's a huge market for 18650s for vaping, which doesn't look like disappearing any time soon. Another source of good 18650 cells is your local vape shop, although they'll tend to be a particular type.