To add to your suggested voter reforms, implement ranked choice voting instead of first past the post.