I have both as well and either will serve you well. The M6 being discontinued means you wont find it easily going forward. Whatever choice you make do make sure to get 18650 and/or 17670 battery holders from mdocod, they make it a lot easier and cheaper running them.
cheers