Honestly the entire districting system should be dropped in favor of statewide party list voting.

Gerrymandering has ensured that every district is like a dick shaped blob on every map and your local rep might live further from you than the nearest 3 other reps.