longarekel, perhaps you should prove that it is only in force until the decree of galus. from the text.
By the way, Rashi on the posuk in Bamidbor would seem to disagree with you. On “v’yishavtem boh” he says “tochlu l’hiskayem boh, v’im lav, lo tochlu l’hiskayem boh.” Which clearly indicates that it applies when you are able to establish yourself there.