@SethW I think that Cabo has it right on this question. My facilitator told me to only worry about it when mixing trips out/in by car and plane. When flying they always stamp your passport and only get the stamp at the border if flying on the other half of the trip.
I always cross at Mexicali West. Pretty simple to find and they are open 24 hours a day. Here are some good directions I found on Facebook: