Yeah looking at using 25R Samsung 18650 which can do 20A continuous discharge so not too concerned with amps, worked with them before as well, they've been pretty bullet proof, also have a good supplier for them.
Having shaved weight already, I've lost about 35kg (77lbs) from the engine alone...