What’s the Best Way to Fix the Patent System’s Problems?

The best ways to fix US patent system? I see two:

1) Determine whether the claim is an invention before granting patent.

2) For overly broad patents, revoke whole patent instead of just excessive part, without ability to reclaim fixed patent.