Will the pilgrim be rewarded for shaving with a razor after exiting the state of Ihram, throwing the pebbles, and shortening the hair, but before performing the Ifadah circumambulation?

Both are sufficient, based on the Almighty's saying: "shaving your heads and shortening [your hair]". What the brother did by shortening his hair is sufficient, and he is not required to do anything else. We hope that he will not be deprived of the reward and recompense if his intention was to make up for it and do what is better, for the Prophet, peace and blessings be upon him, said: "O Allah, have mercy on those who shave their heads." They said: "And those who shorten their hair, O Messenger of Allah?" He said: "O Allah, have mercy on those who shave their heads." They said: "And those who shorten their hair, O Messenger of Allah?" He said: "And those who shorten their hair."