Whatever you decide to do, take into account that distances in Patagonia are huge, and that while air connectivity within the region is now considerably better than a few years ago, flying is not always an available option. One week seems enough to visit El Calafate and Ushuaia or El Calafate and Torres del Paine -- all of which are quite spectacular. Bariloche is one of my favourite places on Earth, especially in the summer, but it's all about hiking and swimming in the majestic (yet cold) lake.
If you want to fly up to Salta and Jujuy afterwards, I would allow at least one extra week. Córdoba, a very popular touristic destination for locals, is of no particular interest for foreigners in my opinion.