Mansion redesign using vaults and raids

I've seen similar ideas floating around, but I'll bring it up anyway.

Issue: Mansions are out of date, and post raids being added in 1.14 have no good/worthwhile loot to make the expedition to them worth it. Raid farms are also OP and give you infinite totems on hardcore.

Solution:

First the mansion gets slightly bigger, with 1 more floor and a secret basement. All chests get replaced with illager-themed vaults that require a new key. (Maybe even all the chests in the giant storage room, but that is probably too much, so i'd say those have at least some amount of vaults.)

Evokers **no longer drop totems** they now **drop keys to the vaults. Even** evokers in raids only drop keys to the vaults in the mansion.

Vaults have a high chance of giving totems and other loot like is found in the mansion now, but it's buffed to be on par with the trial chamber.

Problems with this:

It's kind of annoying you need to go to a mansion to get loot after a raid, a possible fix would be if the final wave dropped a special raid vault that can be opened with a key and gives a totem or 2, some loot maybe even a mansion map, but that crosses out one of the cartographer's uses.

Another possible idea I'm unsure about, maybe there should be 2 types of vaults, one the keys are dropped by vindicators, the other by evokers.

Edit: Someone brought up totems now being finite, so i'll add to the suggestion that totems from vauts are semi rare (not as rare as heavy core), but now they aren't consumable but rechargable, prob with something like killing enough mobs since that is the headcannon i've heared most people have for them, it could also just be something else also. You still have a reason to have multiple totems as you won't have time to recharge them mid fight.