Help which 18650s to get?

Stick to protected cells.

Samsung, Sanyo and Panasonic. These will give you the best run-time.

I posted a thread asking where to buy these before but I ended up finding some deals on DX.
The deals are dead however so I guess do some googling which sites offer those 18650s for a good deal.