You made a character who is suspicious/paranoid not to mention hates hags and witches with a witch in the party... I saw this one coming from the moment you introduced her, but I played the character how he would react, nightfall is coming and he is still out in the open, the night also has an odd feeling and he was once an acolyte of a moon goddess and now has a shadow patron meaning he is doubly on edge, so he is buffing himself (fortune and mage armor thus far). The laughing keeps a buff up that can only affect a particular individual once every 24 hours, and he will continue to keep it up until he feels safe.
Unfortunately, he is not the charming kind of witch and his charisma score is abysmal otherwise I would try a diplomacy check to work this out... though really the scorpion has a better chance of succeeding than he does it can't talk, the most likely outcome of such an attempt is he would force them to come to blows.
I am fine with whatever happens though you need to ask Tenshi about what he wants in this game because if this conflict does come to blows you need to understand that one of us will likely be rerolling a new character.
Actually, I wrote that and have an idea if you want to work it with me? The idea comes from the description of Cackling Hag's Blouse if you want to read up on that just try and work with me.