RR NDB,
Here is my suggestion, from a completely different engineering point of view....
In the re-design, go back from 32V to 24V..
the would allow the room for round cells, and some space between them, in the same box.
This would also negate the need for the stepdown transformers for the voltage....