Make it that you still need to reach an ammo cache to change weapon, but can change the gun parts anywhere.
This makes sense lore wise and gives you much better tactical flexibility since you can only carry one weapon.
Oh and, saved weapon presets would also be nice!
I asked for this as well. Or specifically for the sake of buttstocks. No word yet on whether they intend to implement it.