OP is already set on the battery lights so there is no point to keep beating this horse any longer.
But anyway I like the Dynamo hub because I find it reliably. The lights I have are the Lumotec IQ Premium CYO, and I commute 10 miles on dark country road without street lights or anything. And because my experience I highly recommend this.
Busch & Muller dynamo bicycle lights