Hd2010 is an absolute monster compared to a c8, the led is severely over driven due to it going direct drive on high, it is a bigger light though, with a bigger reflector.
Listening to what you are saying, I do think you want an aspheric lense. This has just been linked in another thread,
And here’s the thread, to give you some context,
That light comes with a charger and some acceptable cells to, and that company may get it to you in time for your hunt, maybe see if they offer priority shipping.
If it suits, you could then get someone to swap out the driver and led for some more oomph, and if you don’t get on with it, it will have served to give you some direction, and you can use the cells/charger elsewhere.
I’m just playing with a c8 xm-l I put together, and it may be too floody reading your comments, same for the hd2010, they put out plenty of light, but maybe not in the way you need.
In the short term though, that z6 would be a good start, and at $25 with cells/charger, no great loss if its not quite right. 
Or leaves plenty if you feel its almost there with a few tweaks.