Hijri Calendar And Divine Law
It basically confirms your point that divine law prescribes lunar calendar instead of solar calendar See footnotes here: https://www.englishtafsir.com/Quran/9/index.html#sdfootnote36sym