That makes sense - and is definitely something we'll need to more clearly support. The distinction between the two cases is also pretty clear, thanks for you all your thoughts here!
We had similar feelings about Auth0's org implementation, it doesn't really match the way most companies think about orgs, especially at an early stage.