What instead of giving the warrior 2 armor,
Let the warrior make a taunt unit 0/1 - taunt. just like the shaman has a 0/2 - taunt.
But... he can continue keep buffing it via his hero power, making it a 0/2- taunt and so on!
This will help buff frothing berzerker and armorsmith..
(The Minion should offcourse be a picture of a shield)
Sry bad english,