I honestly don't think the current system can be fixed.
Neither did anyone in 1986, until the Internal Revenue Code of 1986 was enacted - that went a long way toward fixing a lot of the problems with the prior code, which had gotten all larded up with special gimmies like today's code. We could do a lot worse if all we did was return to the '86 code (minus the AMT, of course).