Yes, Shell A and B are different:
http://ae64.com/images-e41/Compariso...hell_Types.jpg
Shell A is for OEM. Shell B is aftermarket.
You probably need the pin type for A. If you take a picture, we can compare.
Is the pin stuck in there? You shouldn't need the pin extraction tool unless you have the B type harness, even so, I think that a small jeweler's screwdriver will take care of it pretty easily.