Number 2 appears technically to be wrong. Number 2 should read: "Some non-mage enemies attacked Shaapa. After retreating, Shaapa returned to re-engage them in a different area."

Discussing whether Shaapa's reasoning for returning to fight the non-mage enemies is fine and people can disagree whether it was appropriate. But as a technical matter, there is a difference between what Shaapa did, and what Zah allegedly did (never seen that log, only the descriptions here), and it's an important distinction, which boils down to:

Zah struck first, and instigated fights with non-mage enemies.
Shaapa did not.

Again, whether what Shaapa did after the tribunals instigated is fertile ground for discussion, sure. But what he and Zah did are not the same. In my day, initiating against non-enemies is a strict no-no, whereas the "zone of combat", including the time, after you've been attacked, wherein you can continue to fight, is more murky. Again, I am not advocating that Shaapa was right to do what he did, it's valid to say he went too far and crossed the line. But what he did, and what Zah did, were materially different.