I would consider making Hobgoblin a "class".
1st level 1d8 hit points- all armor and weapons, 2 skills, +2 to STR, 1d6 martial damage dice, darkvision 60'
2nd level- +2 to CON
3rd level- +2 to DEX, 2d6 martial damage
After 3rd level they would need to take a PHB class.
I think this makes...