Stick with Rio. Buenos Aires is also a great city (I'm going there on Thursday), but Rio is awesome. Just be street smart and don't wander off. When I went there the first time, I made a couple of friends the first day (one local, one from NY), and we hung out during my whole trip there. It was fantastic.