I think all weapons should have blank spots for upgrades then you do insane bounties to unlock a different upgrade permanently. Then when you get a weapon you can put whatever upgrades on it you want.