Isn’t NCR18650GA a closer competitor to Samsung 35E?
But between the two cells you listed, I’d go with 35E.