Not a perfect solution, but Michigan created a bipartisan commission to redraw districts in 2020. (Well Michigan didn't create it, voters did in a proposal during the 2018 election.) https://www.michigan.gov/micrc