As for redistricting, I'll be interested to see what happens. I'm not sure about how much water this rumor holds, but apparently if NM-02 and NM-03 were split vertically east-west instead of north-south, they would could be made lean Republican instead of the solid Dem and solid Rep they are now. Gary Johnson didn't mess with it in 2000, but I don't think Susana Martinez is as noble.
NM-02 is R+6 and NM-03 is D+7, so it's mathematically impossible to make them both lean Republican without packing NM-01.