I dont think youre wrong but I also dont think youre right in my opinion. I think the show did a poor job of ending his character. His final moments were very, strange. To me it seemed as if he connected the dots but then was looking for cope and saw cassian as the outside agitator that ruined everything and so he then decided to fight for no reason (obv he had a reason but the fate of the ghor was already set in stone which speaks to your impulse point). On re watch I hope the subtleties are more clear to me.