Delay Umrah due to inconvenience

Question

As i have already accomplished hajj, and i have the means, i would like to go for umra as since very long,i didn't go to the Holy Ka'abah. But, at the moment, the haram is being enlarged, so tawaaf is being done only on the ground floor around the Ka'aba, so this result to an immense crowd of men and women making tawaf. So are we allowed to go for umra in this period or do we rather wait till next year when all construction has been completed and thus,tawaaf will be done at ease on ground floor,1st floor and terace?