I’ve never dined at either, but for our next trip I’m going to make reservations at San Angel.
Hopefully we can time dinner with afternoon rains and we’ll take a break there for a ride, a meal and some margaritas.
Seems like reviews for the food have been better than in the past, but mostly I want to go for the ambience.
My vote for you is for San Angel.