Really depends on the type of riding your doing. If your riding really is separate, you may want to consider a more basic commuter bike light and a more extreme mountain biking light. Most bike lights in the US don't have good beam cutoffs, so your choices are a lot more limited. If you separate the lights, you can get an affordable commuting light and a high-powered mountain biking light.

That said, I personally really like the Magicshine Eagle F3 currently, it has nice beam optics and not power without blinding people. Otherwise you can get the higher powered Magicshine 906 and 908 lights for high powered night time riding off road. I have a number of reviews on my website in the signature if you want to see the beam patterns and specs.