I'd be pretty happy with a system that gives only short-term (two-year?) patents on the current criteria, with a 5-10 year extension awarded only after presenting evidence of significant investment or extraordinary novelty to an independent panel of experts.