This seems to be a better place to fix the OS X driver bug via glFinish; glFinish() will get called much less frequently and add less delay.
It seems to me (subjectively) that this further improves accuracy on OS X, though I have no objective measurements right now.