For the third option, a couple interesting ideas I've seen about possible fixes are:
1. Lose only reserve ammo on death.
2. Lose only remaining current mag on death.
3. Lose special ammo only if you have your special weapon out when you die.
-
If not further than Pre recent patch. Hell, put it all the way back to maybe before the April update.