Do you really think this is fixable?  People have been saying, "yeah, but when he gets the nomination he'll be more statesmanlike".  Later, "when he's in office his staff will keep him in check".   It just hasn't happened yet.