You can get one piece panniers, linked by a piece of fabric which will sit over the battery, some have a third top compartment as well.
Means you always have to deploy the full set, but they do go some way to hiding the battery - if that's important to you.
As regards lights, dynamos are good...