Ushuaia is incredibly beautiful, with nice National Parks (Tierra del Fuego), boat trips out into the Beagle channel, etc. The natural scenery is much more impressive than in Puerto Madryn area, but wildlife may be easier to see on the Peninsula Valdes. I have heard great things about Calafate, though.