Just one more thing that I had to deal with...
Selection of crystal and capacitors from OSC pins to ground is critical to get accurate clock. I tried one by one from 10 to 47pF, and best results are with 47pF. But that will depend from board layout and used crystal.
My suggestion is that you buy a lot of crystals, and select appropriate capacitor for it. And use that combination from now.