Even the racial disenfranchisement line has been significantly weakened - there have been cases going up with clearly racially biased districts but so long as there is some other property the districts could have been gerrymandered based on (i.e. "Urbaness") then the courts have let it through.

Right now, anything goes (and the fact that gerrymandering with the explicit intention of entrenching a political party isn't illegal is bonkers).

Alternatively district abolishment and proportional distribution of delegates would also pretty much resolve it - even with a mixed geographic and proportional system where some delegates do have specific areas and others are floating delegates that are used to balance out proportions while allowing local districts to chose an advocate specifically for them.