Saef, it sounds to me from your post that doing yoga would be good for you in multiple ways. First, it would force you to recognize that you can substitute it for one of your other workouts without gaining weight (which I am confident is true). Second, it will push you in ways your other workouts don't, like flexibility. Third, you said yourself you get mental benefits from it. I would suggest maybe just swapping out one weekly weight session for yoga instead to start and see how it goes.
Allison, glad Chico is doing well.
Our dog sitter came by during the day yesterday for a walk with Carter and he didn't even bark at her once! I'm so glad. I think he is going to be just fine with her while we're gone.