The good part of Diablo can be fought during the Evil Main Quest. In the Hell Dungeon, follow it as you normally would, and upon reaching the boss gate instead of entering the portal use the hatch located below it.
The strategy for this fight is similar to normal Diablo. He has all the same moves, however, he doesn't summon twice as many infernals after being weakened. Note that he has different items and stats as well