I agree with you. However I see the Klingon as the ray of hope in this story.
Even if the Klingon’s diplomat status was built on a lie, unless something else reveals new information, the Klingon was dealing with his role in his past war crimes in a positive fashion.
This episode has highlighted how shady Benga has been for quite a well, from his daughter on in. Nurse Chapel walks the gray line as well. I do like him as a character and the idea of a murderous “Frank Castle, CMO” is hmmm some good stuff.
I liked the look Spock shot Chapel when she said “you feel like” and he was like … umm … surely you jest…and let it go. Very cool! And great Vulcan logic in this ep.