Well, I got my XF back yesterday and all is well so far. They did indeed replace the combo Fuel Level Sending Unit/Fuel Tank Pressure Sensor. It took a while to get the problem solved, but I am very happy with the results!