I would suggest checking out Lagger Professional Services at http://www.lagger-pro.com
for a good price. I think the 6Z is around $59 with free shipping. Wayne is also offering two free D123A batteries in addition to the two that come with the light as a Christmas special. The batteries go for about $4 each at LPS. I found them for $8 each in the supermarket.
I would also suggest a Z32 shock resistant bezel for ~$17. A spare light assembly costs about the same price as the Z32 and the assembly will break if light is dropped on something hard.