I got hold of 24 pcs A123 20Ah pouch cells and will build a battery pack with these instead of Headway. 33% more energy and less space. The only downside is that I need to figure out a way to connect them.

I will make 2 pcs of 12S1P pack and design a PCB to connect them to.