You're entirely correct. I was fairly tired when I wrote this up, and I have edited my post to not include proficiency bonus in the damage. Thanks for catching that!
If you have access to Heavy Armor through paladin, Heavy Armor Master is a great pick, though 3 damage from melee attacks isn't...