Well, the good thing about my therapist retiring in July is that I'll be starting up individual DBT. I'm only in DBT GROUP right now. My current therapist, as great as she is, is not very structured with me. (We do "talk" therapy).
I think that all will be well eventually, but not for several months.
Individual DBT should help with the discipline/mindfulness...I have a consultation appointment with an excellent one for a month from now. I actually know her...she was a substitute for my current DBT group therapist when she was on maternity.
Maybe when I see her next month she can give me some tips on what to do...until we start our work in July.