Quite some time after the rework, here is my updated build. I think it's the Best Build overall, from Silver to Master it's the best.
If you're Bronze, you won't use it properly.
If you're High Master or Grand Master, you can get value out of other builds easiy.

The Auto-Attack build is my current favourite, giving you big self sustain and combo potential.

The Eternal Flames build looks like a good idea, but requires good coordination and a lot of mana to execute properly, you can't drag the fight too long.

The Classic Charge build is what it looks like, the closest build to the standard Diablo build before the rework.