Drove down, easy trip of about 2 hrs. Return through the border is likely to be awful, so we are planning to leave Sunday a.m. early and to use the Tecate Crossing. It will be a bit longer but may overall be faster and less frustrating.
I'll add a picture later -