Holy cow! I was thinking that a lot of these ideas were overcomplicating things and just having Pathfinder's system of letting the companion with the highest stats roll without any extra dialogue or reference to it would be fine. But your idea and making use of the tadpole connection, that's brilliant!
