I have searched the forums for light advice, but I think I just need someone to tell me what to do.

I have been commuting with a Cateye EL-220 and a Blackburn Voyager 3.3. I'm not a super fast rider - after dark I would say I ride around 15 mph. I ride in a suburban area, so sometimes I have streetlights and sometimes I don't. However, occasionally there are man-swallowing pot holes I have to avoid, which are my biggest concern.

The lighting combo I currently have doesn't sufficiently light up the road surface to avoid man-swallowing pot holes or woman-flipping cracks. I'd like to get a new lighting set up. I've looked at the lights on Peter White Cycles, and it seems like all of them would be better than what I've got. I'm thinking battery, because I have two commuting bikes (one for 3 seasons, one for winter).

What would be your ideal lighting set up? What would be your semi-ideal lighting setup for $150 or less? Can anyone make the case that I should really go dynamo over battery?