Independent nonpartison commission. Districts of approximately equal population size. Shapes must be reasonable. Only data they see is population data. No demographics. You get what you get.
For the electoral college, make it winner take all per congressional district. The two votes that "represent the senate" go to the top vote getter in the state, and split if the margin of victory is within 5 points (or any other agreed upon number).