Thanks for all the replies and advice. I think I'll stick with the Samsung 25r or 30q's, decisions decisions.
I can't believe the prices on Gearbest (
http://www.gearbest.com/batteries/pp_232875.html ) but as I'm an ultra cautious guy I will probably buy from Torchy.
I do have a couple of more questions;
How long do you generally get out of your batteries before you get rid of them (I'm charging my current batteries once a day in rotation)?
Will my Nitecore D2 and supplied e-cig charger be ok for the higher mAh batteries?
Once again, thanks for any advice.