Simple market-based solution; allow people or their families to sell their organs upon death.
Yeah, I'm sure no family member would ever get carried away by the profit motive under that scenario.
The market does not provide the best answer to all questions.