Have you thought about LiIon packs? One cell is 18mm in diameter and there’s a few ready to use packs to buy in the shops.
I have a plane the same size and after flying for 1.5 hours on the slope including lots of aerobatics, I’ll top up around 600mAh.
Depends of course in the size of servos and how smooth the linkages are.