I bought some from there a few years ago, and could still find them when you asked, so i suggested it. but reading your 2nd link, yeah it does seem like they are wanting them removed, funny tho i see no less than 4 listings for 18650s before i got to their AA packs..

https://www.amazon.com/Authentic-3000mAh-18-65-0-Rechargeable-Flashlight/dp/B08C3XGWG8/ref=sr_1_5?dchild=1&keywords=18650&qid=1598363420&sr=8-5

https://www.amazon.com/Protective-Cases-2500mAh-18-65-0-Battery-Flashlight/dp/B089G4NP72/ref=sr_1_12?dchild=1&keywords=18650&qid=1598363774&sr=8-12

https://www.amazon.com/High-Capacity-Rechargeable-Batteries-18mmX65mm-Flashlight/dp/B08BP1JVLX/ref=sr_1_28?dchild=1&keywords=18650&qid=1598363792&sr=8-28

https://www.amazon.com/Batteries-Battery-Capacity-Rechargeable-Flashlights/dp/B0888QB6QG/ref=sr_1_52?dchild=1&keywords=18650&qid=1598363829&sr=8-52

https://www.amazon.com/Rechargeable-Batteries-Flashlight-Headlamp-Electric/dp/B08GKJBW4M/ref=sr_1_60_sspa?dchild=1&keywords=18650&qid=1598363853&sr=8-60-spons&psc=1&spLa=ZW5jcnlwdGVkUXVhbGlmaWVyPUEzNlA0TTc1R0xQUFMwJmVuY3J5cHRlZElkPUEwMTg0OTY1OUs0RFZRQUw2Q0tTJmVuY3J5cHRlZEFkSWQ9QTAwNTYyMDEyRFlVWVNSMlk3SFVDJndpZGdldE5hbWU9c3BfYnRmJmFjdGlvbj1jbGlja1JlZGlyZWN0JmRvTm90TG9nQ2xpY2s9dHJ1ZQ==