You could try saving/backing up your wow profile.
And then running the wizard for a Diablo profile.

That would get rid of any conflicts, if there were any.