Should the return and payment be mailed to the same address?

No, returns are mailed to:

New Mexico Tax and Revenue Department
P.O. Box 25122
Santa Fe, NM 87504-5122

Payments, including estimated payments, should be mailed to:

New Mexico Taxation and Revenue Department
P.O. Box 8390
Santa Fe, NM 87504-8390