Share 'suggestions for tours of BA?'

Hi, We are STILL coming to BA in early November. Anyone know some good tour guides to recommend? We're interested in tango clubs, maybe a day across the river into Uruguay, definitely a trip to Iguazu Falls. I saw an ad for 2 guys who do these tours but can't find it now. Any help is most appreciated. PLUS, any ideas on estancias not too far away from BA? Pampas is probably too far for this fir…