Steve,
The socket in the headlight bucket is spring loaded and the plug that goes in it is solid. I guess if you use both of the parts you listed it will work but it is reversed from original. The socket is solid and the plug is spring loaded. I can get photos of my originals next time I'm at the shop.
Steve A.