I think you could move somewhat towards having both. Let them gerrymander as much as they want, but at the end you also appoint additional districtless seats nominated by the winners, proportional to the number of votes they won by.