A good analysis Alan. I believe part of the problem here is what i have seen as a tendency to conflate Calonarang with Durga and Rangda. They are all connected in some way, of course, but are certainly different figures with different stories to tell.
Just for illustrative purposes, here is my Balinese Wadon hilt which had been shown on these pages before.
