So the LBS couldn't keep the stock rear wheel in true. It would be good for a few hundred miles then just start losing shape. So, I decided to get some new wheels laced up.
The LBS laced me up some Alex Adventurer rims with 36 spokes. A 105 rear hub and an SRAM i-Light front hub.
The front light was left over from my girlfriends bike after she upgraded to something with a stand light. Its a basic B&M Lumotec. Eventually I'll get something nicer, but this works for now. No stand light so I keep a LED light on the bars as well.
The rear light is a Spanninga XS light I got from Velo-Orange. Its cheap, bright and stays lit for at minimum four minutes. I've watched it stay lit for much longer.
Thinking of getting a B&M Lumotec IQ Cyo RN+ for the front light. We'll see.
For now, this setup works great for the city. I don't even notice a rolling resistance when I turn on the lights.