Hi, I'm in SA so not too far from you.
I can build the battery your after in whatever format you like.
I've got plenty of genuine tesla 18650's in stock so whatever shape ect your after can get it sorted.
If still chasing someone to build this let me know
Look me up on google maps
Bradz ebikes