I ended up getting a Nitecore MH20GT through an Amazon lightning deal. Something like $80 for the light, a Nitecore 3400mah battery, two CR123 batteries, and a couple of other accessories.
I decided on this one not only for the price but because it is a thrower and I already have plenty of floody lights like a Zebralight SC600 MKII and a Nitecore P12, so I figured it would be nice to have a good thrower. I've only had it for a couple of days but so far I'm very happy with it. It actually does make a good dog walking light because it has so much throw that I am able to check things out from a distance to make sure there are no loose, possibly aggressive, dogs approaching (a problem where I live). I also tried it out at a large dog park the other night. It's pitch black there at night and I was able to let my dog loose without worrying. I could light him up very clearly from one end of the park all the way to the other end which is about 200 yards. Didn't even need turbo mode.
To follow up on the Olight issue, the S30RII started having even more problems. It started flickering and the low battery indicator would start flashing even with a fully charged battery. I decided it was too expensive to just toss it so I emailed Olight, told them about the additional problems, and asked them if they would be willing to cover the shipping back to them since they returned the light to me still broken, and it was now having even more problems. They sent me a prepaid shipping label and I sent the light back to them. Hopefully they resolve it this time around.
Either way, because of the Olight problem I ended up with an awesome little pocket sized spotlight.