Shield bash's should deal more damage and stun length depending on the type of shield you have. Also your shield bash should not consume Shield but instead be on a cool down like DASH. Make it more useful in fights as well. Also have it tank any damage while using shield bash, like you said.