Toki is doing well overall with the new rules. Although she's very agitated by dogs walking by outside, she is now spending less time on the sofa so she notices them less often. I took her to PetSmart to get her claws done and she was very sweet, didn't drag me on the leash, and was gentle and submissive when she met another dog in the parking lot.
There is definite overall progress, and progress gives us hope! I had her in a legitimate sloppy heel for the first time last week, and I wanted to do a victory dance!