All 52 states should get a minimum one Senator each. After that, it should be based on population for a total of 200 Senators. So it would be roughly one Senator for about two million or less Americans. That would give California something like 20 Senatorial districts.
It would help to have open primaries. So the two top vote getters might both belong to the same party. And then they go compete in the general election. That should also be true for the House races. Open primaries would kill gerrymandering.
As for president, might as well directly vote. Get rid of the electoral college.
