That's nearly exactly my prediction as well, with the exception that I swap str with con, since PHB gives both str and dex for saving throw proficiency