Messes tend to beget solutions. My personal theory is it gets messy and then we fix Congress because the bandaid is finally gone.
We will have to fix the judiciary as well, as they can just undo anything the legislative or executive does through judicial review and activist interpretation. There are no repercussions for doing so, as there are lifetime appointments.