Luckily going back to the OEMs did the trick for now. Which is good, I didn't like the idea of riding at sunrise without my low beams. I don't like blinding drivers with highs from the rear. The city lights seem to do the trick to prevent anyone from freaking out too much.
I've been really surprised lately how many bikes in the bay area ride around without a headlight.