Is the ritual of Hajj based on the story of the sacrifice of Ishmael (peace be upon him), or does the Qur'an affirm that the sacrifice was Isaac (peace be upon him)?

The ritual of Hajj began in the time of Adam, peace be upon him, and angels performed Hajj to it before Adam. The one to be sacrificed is Ishmael, peace be upon him, not Isaac, because Allah gave glad tidings to Sarah of Isaac, and after Isaac, Jacob. So how could Abraham be commanded to sacrifice him while he was young, and Abraham had certainty that he would live to father Jacob? And it is mentioned in Surat As-Saffat the glad tidings of a forbearing boy (Ishmael), then the story of his sacrifice, then the second glad tidings of Isaac came after the story of the sacrifice.