What version do you have? Try setting kite distance to 80 under Combat->WitchDoctor. Does that help? It should move all weird when there's nothing to cast and try to keep its distance.
Thank you for fixing ADHD but I preferred my Ghost Bomb fix, because now it gets stuck a lot when Elite Pack or Goblin is one screen away and it doesn't attack some bounty monsters (pets dont touch them so WD just stands there, doing nothing and only sometimes casting missplaced Wall of Death or Soul Harvest). Before it would kill them with any equipped skills like a default CR behaviour (this happens during "disrupt 3 rituals" A1 bounty, Leoric's Dungeon I think).