My response is yes.

The primary reason is that it's an incentive for people to take care of their bodies. A second reason is it provides an automatic life-insurance for their survivors.

We want to incentivize people to do anything that has a benefit to society. Taking care of your body in such a way that your organs can be reused in the event of an early death is a benefit. We will have a larger number of viable organs if people do take care of their bodies. We will also have a larger number of viable organs if people have a reason to be organ donors.

Next the most common organ donor is young. They are the most likely to have organs we want. Motorcycle accident victims and what not. They are also the most likely to not have life insurance or be under-insured for the how long their spouse will survive them and how long their children will remain children. If they managed to not drink heavily and have organs that will be able to benefit society why not roll that over to their survivors?