It is, except we have no way of knowing it’s Echo. I tried to pull “I’m Fives and this is Echo” from elsewhere but it didn’t have the right tone.
That said, I agree with all your points. This one’s just a tricky puzzle as there are a lot of variables. I essentially have to make each alternative possibility in full. I’ll get there though!
The other tricky bit is ending on a scene that’s punctual enough to fade to either the credits or a “two weeks later” card. As it stands, “That’s an automatic fail” isn’t a very strong moment. And 99 keeping Heavy in play is good, but almost a bit too sentimental for after a full fail. It’s probably still the right answer, though I’ll have to play with the music.