That does help, yeah.

Now, I think you still might have too much complexity here. A rare-but-intricate system is likely to cause extreme slowdown just when you want things to be tensest, as players fumble with how this works and what that ability does. It also doesn't, in my mind, particularly mesh with a "losers doing off jobs" paradigm- this level of equipment customization speaks to me of elite military, where you can change your kit for specific missions. I also fear that it can obscure the sort of trade-offs you want players to consider by wrapping everything in extra layers of detail, and place more emphasis on metagame preparation than tactical strategy.