Witch is too weak, it has very little way of finding its teammates (especially non-murderer teammates) and so I propose a change. Instead of the typical roles for the evil team, it should be changed:
Evil roles:
-> Murderer
-> Assassin or Ambusher
-> Scout or Dark Psychic
If a lobby of 15, then include a Witch
I think this really fits a lot better than the old system!