I actually wound up with $150 on Amazon so I just went with this for now:

http://www.amazon.com/CygoLite-Rover...681676&sr=8-13

From what I read the light beam has a really nice spread and it's bright enough for trail riding in the dark, plus it has three brightness modes so I can set it lower for city riding (supposedly the lowest 'SOS' mode could be on par with my current light). If it's not bright enough for my needs I'll still get an MS and use this as a backup.