For the battery I decided to go with the Samsung 30Q 18650 cells. Purchased from IMR. I tested them. Cells are authentic.
See my battery build topic for details: