I’ve always been in favor of ranked choice + district based voting. That would force us to more directly address gerrymandering as well as be more palatable to folks against going full popular while still being more representative of the people’s vote.