I like this idea. Though I would also say we should be able to select a specific animal we want the first time we take Beastmaster or Beast Tamer so we can have the animal companion we want most out the gate.

Keep the ability to re-summon them, though. Maybe we can have a little stable at camp where we can see our pets and pick which ones we can summon in the field.