Followup:

The passport official would have accepted the old visa--at least had our plane not been any later than it was. We were wheels-up 7 hours after the scheduled departure and it was 28 minutes to midnight when we hit passport control.

I'm glad I got a new one. Being deported because of a late flight would be crazy!