Ok, now that I've spent my fourth day in a row obsessing over bike lights... I'm starting to think that I want a B&M Cyo Premium, which I can get when I'm in europe in July for around 55$ USD. Until then I'll use my cheap lamp...Now I just need to sort out the actual dynamo part!