OK, so it sounds like you would enjoy a little of this and a little of that. Experiment with some salon places.
Flor de Milonga is long gone from San Telmo (see why hoy-milonga.com is so useful?). It moved to La Boca, and now I think is somewhere on Rivadavia. The outdoor milonga in Plaza Dorrego continues, but it has shrunk into a small, sad shell of its former self. The neighboring restaurants have captured some of the space, and the Murgas (the guys who bang their drums endlessly every Sunday night) now park themselves right next to the milonga, so you can't even hear the tango music.
A nice place, late on Sunday nights, is Torquato Tasso. They usually have a very good orchestra and the dancing is fun. I also love Cochabamba 444 on Thursday nights. A tiny, cool spot with good neighborhood dancers.
TT -- i'll be for sure!!! i was also thinking of Lo de Celia and Gricel - any opinion?