Well, back to the dealer tomorrow. CEL randomly turned back on tonight.
On an unrelated note, a few weeks back while at the border my car was struggling to move and felt like stalling at idle. Saw the rpms dip to under 500 and bounce back up to normal every few seconds. Even while accelerating it would stall/hesitate around 1500 rpm. This lasted for about 10 minutes. Even having restarted the car symptoms persisted. For whatever reason, a second shut down cured all problems and it was back to being completely normal.