Gerrymandering won't go away because it is beneficial to both major parties.
The non-zero sum benefit of not having to compete in as many districts can't outweigh the harm of being relegated to the minority party. Surely a party would rather compete and win than not compete and lose.