My terminals arrived while I was away last week and they're an exact match. I had to do some creative crimping since I didn't have the correct style crimper and couldn't find the right one locally. The one on the website is a bit too expensive for my tastes.
I didn't want to waste money if these didn't match (and Herr Hatcher doesn't have anything that correlates parts to bikes) so I bought a terminal removal tool instead of buying the Molex connectors. Now that I now they fit, I'm going to buy a couple of each style to keep in the spare parts bins.
It was definitely worth the work as there are no crappy looking soldered wires covered in electrical tape or heat shrink tubing, the connectors come apart easily for track days, and looks like the factory installed the lights.
Lesson learned: Don't waste money on a terminal removal tool. If you have a small pick you'll have an easier time removing the terminals from the connectors. In my case, I spent $26 on the tool and ended up using a safety pin.
(The website is a bit difficult to navigate and order from. Scroll down to electrical connectors to see what he has.)
CW34-6971 - female terminals
CW34-6969 - male terminals (if you need them)