Lots Of Land: Daf 119b in Zevachim

On daf 119b in Zevachim, the Gemara discusses the words “nachalah” and “menuchah” in the verse “For you have not yet come to the resting place (menuchah) or the inheritance (nachalah).”
According to one opinion, both words are prophetic references to the Mishkan in Shiloh. How is the term “resting place” appropriate to the time that the Mishkan was built in Shiloh? All of Eretz Yisrael had not yet been conquered! Rashi (Yehoshua 18:1) states that after the Mishkan was erected in Shiloh it was easy to conquer the remaining parts of Eretz Yisrael. It can therefore be deemed a resting place, in contrast to the years before the Mishkan was built.
The Gemara further explains that the term nachalah is appropriate because Shiloh was the place where Yehoshua divided the land using a lottery. This seems difficult to understand since the Gemara clearly stated on an earlier daf that Klal Yisrael spent seven years dividing Eretz Yisrael while the Mishkan was in Gilgal. The answer lies in a pasuk in Yehoshua (18:2). The pasuk states that only seven tribes took part in the lottery at Shiloh. Rashi explains that Reuven, Gad, and half the tribe of Menashe already took their portion in Transjordan during the lifetime of Moshe Rabbeinu. During the earlier division of Eretz Yisrael proper, Yehuda, Ephraim, and half of Menashe took their portion. Hence, there were still seven tribes remaining that needed to take part in the lottery at Shiloh to receive their portion of land.