In our UAV we changed battery in order to save some weigth too; we had TRU RC 3P 4S (11.1@16A) weigthing 1216g and now we went to a custom pack: 3P 3S (
[email protected]) which weights 1068g.
Maybe you can give a similar approach to your system; I can give you more detail on monday if you have interest...