I would remove the "animal" flavour of the class and make it a purely mechanical companion class.
Then you would have subclasses where the flavour resides, whether that is companion animal, artificial construct, ancestral or Nature spirit, animated dead, faithful mount, extradimensional monster...