I think you will be surprised by the quality of the body construction.  Make sure you look at the Baton Pro also.  It uses the customized 18650 Battery with 3200mAh.  The Baton Pro gives you a 2000 lumens briefly and then drops to 600 lumens.  Level 2 operates at 600 lumens for 210 minutes.  You can go directly to 600 lumens with out using the 2000 lumens at level 1.  I know you have been using a 600 lumens light and this light might be a good fit for you. 

You have 30 days to return a flashlight in new condition.  So if you are not satisfied, you can return it.  

Make sure you let us know what you think about the light you buy. 

Frank