Thankfully, when replacing my crankshaft sensor, I bought the OE Bosch part.
Guess I didn't have to invest all that money and time into my car. Does seems the crankshaft position sensor & solder joints on RCM were common problems with the XF and my battery was on the older side anyway - so I'm looking it as preventive care.

Thank you all for the information. Greatly appreciated!