You sound good and the boundary thing really does help. It can be tough and I know I really have to think about certain ones before so I don't reneg later.
It's fascinating to me to re-read happy_agains older threads b/c you can just feel the anger coming off in waves. I keep going back to his threads b/c it helps to to look at things from different angles depending on where I am at the moment.