If you go with a dyno, the headlight I'd suggest is the Cyo variant with the longer range. At your descending speeds, you need to see stuff with some reaction time. The eDelux is a "tuner" Cyo with even more output and a durable glass lens, but the price nearly doubles again, so the Cyo looks like the best buy.
If you're considering a battery-powered light, I'm pretty sold on my S-Mini flashlights. They're small enough to pocket. They come in two variants:
XP-G (somewhat more focused beam) and
XM-L (sort of an intermediate-flood beam). I prefer the XP-G and it's approximately the equal of my Cyo, probably better. Amazing for a 45-gram light
If you want to look into the S-Mini option, you'd need protected 18650 lithium-ion cells and a charger, plus a
CycleBlock to mount it in (and I recommend rubber-banding it down so it doesn't sneak out). So you're out the door at about $80 or so. Be aware that the runtime on full power is on the order of 2 hours, so you do need to keep up on your charging routine.
In any case, the flash mode on your 1W Blaze would be worth keeping it around for, it does catch peoples' eye before they pull out in front of you on a descent.