Except the effective choice for this general election is between a person who has changed stories over the course of years and a person who changes stories over the course of a single interview.
Pretty much agree with the rest of your assessment, though. Both are hawkish—Clinton demonstrably so. Once again, the real hope lies in legislature. All that’s needed is a coalition of Dems and Reps to oppose maintenance/extension of the aggressive aspects of the Bush and Obama doctrines. My only concern is that the Republican component of that coalition will balk when it comes to cutting military spending.