Necturna
Well, it seems I completely missed the first poll, and I am not a particular fan of any of these. That being said, I think Necturna seems the most fitting. It's not a shaman, and Willowitch is just too blatant of a pun, not to mention that it is not a witch either.