I'd go back to the shop that sold you the bike and have them order a Shimano Alfine or a Nexus DH-3D72 generator hub (both are center lock disc hubs). Then have them build the hub into your existing rim using new spokes (the old ones aren't the correct length). Now you have all the power you'll need at the best price.

Next, choose a headlamp. Some are dedicated front light only, others also drive a rear tail light. Some have a standby feature for when you're stopped at a traffic light. Which is best really depends on your conditions.

When I lived in Chicago, there's lots of ambient light so it's more about being seen. In that case, the Planetbike dyno headlamp worked well. It blinked and wasn't too bright (pedestrians don't like bright lights). It didn't have provisions for a tailight, I just used a battery powered blinky.

I've since moved from the big city to small town Colorado, not many street lights and there's bike paths. I changed to a Phillips Saferide dyno light, it's the best dyno light I've ever used. I did have to source it from Europe (I doubt your LBS wants to deal with it). It has a standby feature that keeps the lights lit when stopped at a traffic light and comes with a matching tailight. Other good brands are Supernova, Schmidt and "Busch and Müller":
Universal Cycles -- Lighting Systems > Generator Lights

There are some other choices for dynohub, I've tried them all except the SON hubs. IMO, the SON is really overpriced. There's a better option, the new SP dynohubs, lower drag, higher power, lower price. Unfortunately they're not really available to an LBS, I bought mine off of ebay. I'd stay away from the SRAM dynohub, it's got lots of vibration and just seems cheap.

Here's a website with way to much info on dyno powered bike lights (I bought my Phillips dyno light kit from him):
Bicycle lighting, mostly powered via dynamo, and USB power from dynamo