Wow, thanks for the comprehensive input!
30% of the ride is on city streets, 70% on a dark multiuse trail.
How about this combo?
Amazon.com : Cygolite Streak 310/Hotshot SL USB Light Combo : Sports & Outdoors
Also thanks for the input on reflectors. I will get some ankle units (need them anyway for various pants) and will also upgrade the pannier with reflective material. I also have an orange bike jacket coming.
Thanks!!!
G