Sounds good.
Just to double check (because I am about to make an order from digkey) (and my last order.. I had some wrongly ordered parts)
For the Caps, I would use:
http://www.digikey.com/scripts/DkSearch/dksus.dll?Detail?Ref=328204&Row=415594&Site=US
Ah grasshopper, you have missed the calculation of the cap values.
C = 2CL - Cstray
C = (2*18)-6 Guessing at 5-6pF or thereabouts
C = 30pF
The reason for this, in short, is that from the crystal's point of view, the caps are in series.