I don't know if this has already been floated as an idea but there are three vaults on the map why not have them each be an independent inventory you can select from. This would triple the vault space and make pretty much everyone happy.