Hi @wus , this question has been asked before overhere.
The sad truth is that 18500 batteries have not evolved as much as other sizes, because demand is low. Best you can expect is 2,300 mAh,
I don’t know where your house lives (shipping etc) but here is a link to NKON. Quality is good, seller is reputable, but overseas shipping is expensive (even for NKON).