@Ragman,
First, I would propose term limits for all national offices. We need people who want to serve the people, not themselves or their parties.
Second, if we must have parties, I would propose that candidates proclaim a party/platform of choice but that voters would not register with any party and that all elections (primary, and otherwise) be open elections.
Third, if we end up with multiple parties then I suggest a coalition type government.