Joystick does (I’ve got last years) if you’re just a pootler. Don’t let anyone tell you otherwise.
The new one will be brighter for sure, though apparently it’s a bit of a narrower beam/more central punch.
Joystick on it’s own is fine for me on my own, though it does get drowned by shadows in a group of big/bright/brash lights. But I’m usually at the back so not too much an issue. I whack on a white eye for those situations as it’ll still run for 1.5hrs with the white eye.
if you go for the Diablo, shell out and buy a single piggy battery at the same time, extends run time to 2 hours on max, or double that on medium (which’ll still be theoretically more powerful than joystick on max)