That's the one, but it seems to be scarce.
I'm actually doing the same thing with mine. I intend to make a good faith effort to see if the male/female counterpart connector can be obtained at a reasonable price in a reasonable time, BMW or otherwise.
If not, I'll convert to a generic 2 pin waterproof connector, as John mentioned.
I'll post here if I turn anything up.