common mode choke inductance question
Your assumptions are spot on. 

Another thing to bear in mind is that any leakage inductance between the common-mode windings manifests itself as a parasitic differential mode inductor - this is why it's common to see toroidal common-mode chokes with the windings opposite each other (not interleaved) to maximize leakage inductance and get that 'free' differential mode filtering.