Until gerrymandering is outlawed, neither approach will resolve anything.
What does return of the Senate to the States have to do with gerrymandering?