[2020] Battlegrounds: Should Menagerie Magician and Zoobot be replaced with modified versions?

So Zoobot and Menagerie Magician are interesting support for the battlegrounds Menagerie archetype. However the biggest issue is they only support 3 specific tribes: murloc, beast, and dragon. Technically Zoobot interacts with mechs and benefit from mech support but no one would use it for mech plays.

The main issue I find is that even if you have a menagerie of sorts if it's not the right tribes then you gain very little benefit, and unless your the curator there will be games without murlocs, beasts, or dragons making the two cards naturally neutered. So I thought why not change them a bit by creating new cards that are essentially the same as Menagerie Magician and Zoobot without specifying specific tribes.

So if we're looking for names I feel like we could call them "Lightfang *****" the exact name at the end doesn't really matter, but since lightfang enforcer exists and is the main buff for menageries currently it would be a good idea to keep to the naming scheme.

For the Magician replacement the it would still be a tier 4 4/4 but with the battlecry "Give a random friendly minion of each tribe +2/+2" It's strong and could make menagerie builds include brann in some instances. It also makes it so you want to get a full menagerie earlier on.

For the Zoobot replacement however it would be a 3/3, but be tribeless. Whether it's still a 2 star or 3 star is debatable depending on how strong the effect is for the early turns. Then comes the question of what effect the card could have. I have 2 different ideas on the effect. The first is "Battlecry: give 3 friendly minions of different tribes +1/+1" or essentially a zoobot that isn't picky about it's tribes. The second idea is "Battlecry: give a randomly friendly minion of each tribe +1/+1" or essentially the magician replacement but the effect is half as strong. The first battlecry would make the minion have similar utility to Zoobot but be easier to use. The second however would both be limited early on (there's only so many tribes you could consistently have that early) but also help with potential scaling later on. Instead of having 1 card that buffs at the end of the turn and 1 card that can be bought for battlecry buffing and sold for the build you have 2 battlecry buffs for a relatively flexible build.

At the very least would anyone else be interested in a more flexible zoobot/menagerie magician?