What about warrants for spying?
Not good. But if the federal legislation covering elections goes through, you can work to repair warrantless spying.
Or you could remove Johnson and hope that somebody else steps forward and proposes to fix the electoral system.