Why not just let the patient choose, set a restrictive default and allow individuals to relax this default. So in the case of assisted suicide, it seems more reasonable to surgically remove the heart, than to first use poison and then remove the heart.
This makes perfect sense. I know people who would be terrified of the thought that their organs could be harvested while they might yet recover, but also people who be horrified that their perfectly good organs are just laying there, unused, after their brain has died, but with artificial respiration/circulation keeping some of the rest of their body going.
I think a sane default is to require opt-out for organ donation after brain death (what Europe does now, I believe) with an opt-in "sliding-scale" for the rest of the possibilities.
[Edit] Spelling