Your best bet are these which are just re-wrapped Sony VTC4 2100mah 30amp continuous, Sony has made this partnership I believe to reduce their liability.

Xtar High Drain 18650 2100mAh 30a (Sony VTC4 cell) - RTD vapor