Apologies, if I mis understood.
I read it that op has Samsung cells now but it wasn't a requirement. Same as the other specs like the 8ah.
I got the impression that a like for like shape and connector was more important.
Personally I'd just buy a bottime battery from woosh. 225 Inc charger...