For the Knight, perhaps throw in a new fighting style.

Shield Fighting - When you take this fighting style, you gain proficiency in shields as a bludgeoning weapon. It uses your strength modifier for its attack roll and deals 1d4 damage on a hit. When you take the attack action with a one-handed light weapon while wielding a shield, you can make a shield attack as a bonus action.