Non Pashtun does not occupy Afghan land either, they are a part of Afghanistan. Infact, we Pashtuns in many cases have took over their lands, the Tajiks and Uzbeks are living Afghanistan because our leaders before us let them participate in the Jirgas and conquests. Afghanistan was not only formed with the blood spill of Pashtuns, there were tribes and groups like Tajiks, Uzbeks, Pashae and Nooristanies that always fought the invaders, shoulder to shoulder. Also, the Tajiks and other minorities of Afghanistan are not residing in Afghanistan on some kind of british signed treaty (comparing it with our Afghanland across the border). They were a part of Afghanistan as long as I can remember reading history.
I'm not sure if you've looked into your desire for Pashtuns/Afghans, but this is what the enemy always wanted, WEST/Pakistan etc. You wan't to break Afghanistan into many pieces, resulting in some Pashtun lands being disolved in majority Tajik areas.