Very interesting.
Your point has further implications: it is a question in the meforshim there if ‘forty years’ is meant as a precise figure. If it is, it ended after Moshe’s death. So we have a passuk recording events after Moshe’s death, similar to the last 8 pesukim in the Torah – and there its a machlokes if Moshe wrote it at all…