The problem is that no one knows what the HR Insurgentes is going to be like. It honestly sounds like you would like Polanco - it's safe and walkable with good restaurants. You should probably just go with the old HR, but know that experiences can be mixed. I actually liked the property, including the club offering (at least by North American standards).
Plus, if you're staying at the STR, too (great property, by the way), you'll get to be in Downtown proper for part, too.
I really liked Condesa as an area, but you can walk there from the STR. The Andaz doesn't even have a real breakfast restaurant open yet.