While I love both cities, I think I'd give Buenos Aires the edge. For one reason, if you don't already have a visa to visit Brazil, the hassle and expense is reason enough to tilt in favor of BA. But whichever you choose, both are gorgeous and very different cities. If you choose BA, save MVD for another time - they'll be more than enough to keep you occupied.