The solution is simple and already being employed in several states. Non partisan redistricting commissions. CA has done this as well as your own state (over the objections of the Gov I might add). FL passed a version saying that incumbent protection can't be the basis of drawing the lines and several districts are in flux now thanks to a lawsuit.
In fact, this is more simple than it appears. IIRC about a dozen states have some form of this law on the books. Beyond that non-partisan redistricting is essentually meaningless in one or two seat states (off the top of my head ME, NH, VT, RI, DE, WY, ID, MT, AK, HI, ND, SD). So half the states aren't an issue.
That means the rest, and particularly larger states like TX, NY, IL, OH, MI, WI, WA, VA, NC need to get on board and let the chips fall where they may as far as who benefits or not.