I have a Shimano dynohub and CYO N+ headlight on my rando bike and a dyno-powered tail-light. I plan to replicate this setup on my commuter, which is currently similar to yours. I love the beam of the CYO N+, and particularly like not having batteries/charging.
On the rando bike I have backup battery lights front and rear, but probably won't bother on the commuter.