35e are so so cells not designed for high current so stick with GA.
There is world wide shortage of decent 18650's at the mo, the UK supplier I use is only able to get one type of cell at the mo, direct form the Taiwanese factory so t least they are genuine.
Only buy cells from trusted sources...