LBS here tends to stock the lower ranges of Trek
because the customers are not looking for the upper end.
Redline and Felt are also good companies .
I will be leaving for work around 4:00am and returning home around 6:00ish pm give or take an hour. So I planned on getting a decent light
I'd look into a hub dynamo upgrade.. Wired LED Head and Tail lights .
light will be generated by your riding, relieving you of worrying
if the battery capacity, will last out the ride.