Weird X-Pro1 Macro AF problem

I do a fair amount of food photography using the X100 and XPro-1 (w/ 35/1.4). With the XPro-1 on many occasions the camera's AF sensor lights green to tell me the image is in focus when it is definitely not in focus. The only fix is to focus on something far away then move the camera back towards the subject.

In all situations I've used the central sensor (smallest box possible) in macro mode. The funny thing is that some part of the image is in focus. But its nowhere near the actual sensor.

In summary the problem is false focus confirmation. This happens in good light.

Here are two images where it worked. After re-aiming the camera... Again, these are examples where AF was indicated and was accurate. The problem is that it took some 5 minutes to get each of these.