My original 960 with an RB S7C had the same problem, but my new 960-08 with an RB C5 lines up perfectly.
As for the tank, my mounts have no spacers under them and there is just enough room for a aaa pack. I can't see how it would work with cells bigger than aaa.