Webdeveloperfag, not a lawfag, but it would seem the first issue to fix here would be the direct election of senators. Go back to the appointment of senators by the state legislatures first. Then, also make the appointment or suggestion of each state's SCOTUS suggestion a function of the state legislatures. Makes the functioning of the representative republic much more like it was originally intended. State-level house districts are much tighter and smaller than federal level house districts.