Your circumambulation between al Safa and al-Marwa is enough for your Hajj and 'Umra.
Sahih Muslim Book 15, Hadith 143