Thanks for all the input. Very good analysis.
And to slightly highjack my own thread: Once you receive an Animal companion, do you roll stats or use the stats from the MM? I cannot find any rules for this, but I think it boils down to what the DM says.