Praise be to Allah, the Lord of the Worlds; and may His blessings and peace be upon our Prophet Muhammad and upon all his Family and Companions.
There is no difference of opinion that Tawaf Al Wada’ is something lawful after having done Umrah. The difference of opinion is whether it is obligatory or not.
To be on the safe side, it is preferable for someone doing Umrah to perform it, and you did well by performing Tawaf Wada’ after the Umrah, when leaving Makkah.
We draw your attention, however, to the fact that as you travelled after Umrah to Al Khobar, that makes the Tamatu’ invalid.
Therefore, if you want to make Hajj-Tamatu’, you have to do another Umrah when you travel for Hajj and not travel after that a distance by which a person is allowed to shorten the prayers. You can make Hajj-Mufrad, or Hajj-Qariun, from the Miqat if you do not wish to perform another Umrah to be allowed to make Hajj-Tamatu’.
Allah knows best.