The real solution would be having more than 2 parties. I mean, TECHNICALLY we do but not really. You are going to have to fundamentally change the way we vote and how we count them. In a single-choice-vote, plurality system it will mathematically trend toward having exactly two viable choices, no matter how many are allowed on the ballot. Mixed-member proportional would probably work well for the House and Senate, and some judicial/executive positions. Where that’s not tenable (President, Governor, etc.) a Condorcet Method should be employed.