my stock 8ah battery using 21700 cells isn't cutting it with capacity riding in a ebike group ride. most has surons and they got minimum 20ah and most has high 30's ah. I need at least 20ah.

I'm deciding on either one of the 2 below. both are 50amp continuous which my controller needs and both are 52v 21ah (i'm sticking to only 52v for now). but one of them uses 3500 cells and the other one is 18650 cells. They both cost the same but which cells are more ideal over the other?

https://www.electrifybike.com/collec...bike-battery-1
https://lunacycle.com/52v-luna-direwolf-ebike-battery/