I get your point, but FWIW, México is not a Mexican deviation; it's just an older Spanish spelling. E.g. Jiménez was once spelled Ximénez and there are probably lots of other examples.

The "root language spoken in its original place" absolutely did pronounce X like modern J.