What always bothered me about Trip's death was how dramatically arbitrary it seemed. Enterprise had been boarded before; Trip had been captured before; there were MACOs and a security team that were almost certainly on their way. And yet, Trip is unable to think of any other way to thwart the bad guys than blowing himself up? It's not particularly intuitive, this notion that he's gotten out of worse scraps without resorting to kamazake techniques but must resort to self-sacrifice now.
Or how it even remotely applied to Riker's situation, for that matter.

Gee, should I tell my captain the hugely top secret thing I know that I apparently already told my ex-girlfriend, or should I keep it to myself since I've been ordered to by an Admiral? Oh, I know, I'll blow myself up, then I won't have to do either one...