I was saving this discussion until after we finish the script.
But what I will say now is the odd thing is that the script seems to present evidence that Angelique was a witch AND that she wasn't (though the evidence that she wasn't is only in the 129 minute version of the film). But like you, I lean more in the direction of thinking that she was.
And I'll advance that theory after we finish the script...