The easiest "fix" for damage cards would be:
If you receive a face-up damage card, which does nothing to you, flip the card face-down and draw another face-down damage card.
So basically, if you can't remove a secondary weapon, you get a second hit. If you get a second pilot skill zero crit, again another damage.
Edited by MrkvChain