Consider buying used HP and IBM laptop battery packs. lots of good NCR cells in there. check the 18650 battery thread for specifics.

I ended up with more good 18650 A 2900mAh then I can use.

I have 6 used SF18650GR in great shape I sell you for $2 ea plus shipping.