Update...
After the reprogramming in April, I changed the oil that weekend with M1EP 5w30 with the illustrious MS-13340 spec. In early June, the same condition occurred (hesitation, CEL) and a restart allowed it to drive normal and the light cleared itself shortly after.
Took it in, same code...