To be honest, I think pulling another "person dies immediately after kissing longtime romantically teased partner" thing at midseason would be a bit much anyway. IMO, the episode stands if Shaw lives, because the important thing is that she was willing to sacrifice herself for everyone, even if it doesn't end in her…