I think this is pretty similar to the build I used. You'll really love the stun on Impale for normal because it stuns him all the time and really makes it easier. Also if you don't like Marked for Death, Preparation is pretty good to keep your discipline refreshed.
Basically first phase just keep away from him as much as possible. Use Impale whenever you can to get him stunned (bat should help for more hatred). If you're paying attention you should be able to just run out of the way whenever he throws a fireball at you. If you aren't quick enough on your own, you can always Vault out if needed. Basically I just kited him in circles laying down caltrops to keep him slowed. When he teleports to you, that's when I would try and save my Vaults for. I don't know how much health you have, but you could also just throw 2 Impales at him quick and one should stun him.
Phase 2 is a little more tricky. Make sure you have plenty of hatred available for when he spawns the shadow clone. It hits harder than him but if you Impale it you should keep it stunlocked until it dies a few hits later. Just keep going with Caltrops and kiting Diablo around trying not to take too many hits. If he gets you to half or so, it's best to use a health pot then rather than when you have only a few HP left because it will come off CD sooner so hopefully it will be ready by the next time you need it.
Phase 3 is pretty much the same as phase 1 only he will also shoot a lightning breath at you that really hurts. Just Vault out of the way.
If you're wondering why I have Vengeance in the build, the Shadow Clone (and sometimes Diablo himself) will drop a lot of health globes and it actually generates a lot of hatred and discipline for you.
Some people really like the bola stun as a generator, but I like Hungering Arrow because I can get really far away where I can't see him on my screen and then just shoot it in the direction of where he shows up on the minimap and it should track and hit him.