How about getting rid of districts completely ?

Everyone picks 2 senators from the list of choices
Everyone picks <n> representatives from the list of choices