We should also move to proportional representation to fix that.

Nailed it. Gerrymandering is impossible to fix so long as we rely on geographical districts. In a state with 20 districts, 45% voting Democrat, 45% voting Republican, 5% voting Pirate, and 5% voting Ninja, we should have a congressional delegation of 1 Ninja, 1 Pirate, 9 Democrats, and 9 Republicans. Instead, we get 12 Republicans, 8 Democrats, no ninjas, and no pirates.