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.