For sure, FWIW I'm personally an organ donor and broadly agree with your logic. Those are just some times when I feel the choice not to donate organs is valid.

A person's choice is probably always valid regardless of what it is, it's their body at the end of the day. In the normative sense I think everyone should donate their organs, but I'm not sure it can be reasonably codified.