Ahhhh, I was resetting after the office run, not before, so I didn't even think to check that guy from the beginning. That solved the whole post-mission issue (I luckily had a save right before talking to Elam), but glad I was able to point out the less-perfect scenario issue!