Umrah Or Itikaf
Both are very noble ibadah. There is no priority established in religion in choosing one nafl ibadah over another, it is upto the individual and his own preference. However, considering the contingency of logistical constraints that may or may not happen in the future, I would personally choose Umra but this is my personal preference as per my own circumstances.