I too would recommend that you take a look at DBT (Dialectical Behavior Therapy). Major focuses of DBT are emotion regulation and distress tolerance.