I am thinking that 12ft may be a bit on the close side for MFA'ing at 600mm - also it is not that far away from Minimum focusing distance of just under 9ft.
My understanding is that the recommended distance is 50 x focal length in mm, ie 50 x 600mm = 30m.
Maybe worth a try to see if your MFA values change.
True. I do feel it is working better now though. I also need to test in better lighting. But I got 2 more weeks again if I had to return it. So we'll see how it ends up. But so far, it's looking much better.