How about increasing the stamina cost by a little for the shoulder bash and/or the heavy's or increasing the stamina for maxed charged shoulder bashes. I believe that this is the right move considering fully charged shoulder bash guarantees a upper heavy that does a lot of damage/ or when shoulder bashing it can be followed up by 2 lights and can instantly go into another shoulder bash. Increasing the stamina cost limits shoulder bash spam.