I hope you get your kidney in time.
I think organ donation should be opt-out. And if you have opted out, you are ineligible to receive an organ transplant. (With at least a 12 month waiting period after opting back in.)
Further, there should be a 3 month waiting period to effect an opt-out. No opting out and then killing yourself out of spite, or having next-of-kin object to an accident victim who has not opted out from donating organs & tissue.
From what I've read, this would solve the organ shortage in most regions.