Turns out I was actually correct the first time about parent rigidbody behaviour for non-kinematic rigidbodies, but kinematic rigidbodies behave differently. BaseEntity.Parenting now handles both cases.