Update to my post:

The bulb is also a different - one of the newer ford types. Don't know how to deal with the harness issue and the socket doesnt appear to mount at the back of the lamp assembly properly either.