On our trip in this past November, we decided to head back to San Angel, too. Unlike you, we had a great experience there on our first visit in 2006, so we had no reason to doubt our decision.
We found it to be every bit as good as it was the first time around, if not better. They seem to be making their own chips and salsa now, which is nice, and the food seems to be focusing more on fresh ingredients.
The margaritas have definitely received an upgrade in quality since the advent of La Cava. I think it's worth another go, if you're seriously considering it. It might surprise you.