Maybe the party needs to adopt bylaws saying that there shall be no fewer than three candidates in any Presidential primary, even for an incumbant. That will take away a bit of the stigma against challenging an incumbent. It would no longer be a direct challenge to the establishment, and more of a party role to fill.