Yeah, that's totally fair. I feel like just having these little stories with pass/fail conditions adds enough replay value on its own to be enjoyable.
Those fail message tweaks will definitely be helpful.