D600 or D800 or Wait longer?

It's Beginning to Look a Lot Like Christmas

My wife will get me either the D800 or the D600.

She doesn't know about the focusing or dust/oil issues.

Does anyone feel that it is pretty safe to purchase one now without the issues?

Which one?

Has there been a noticeable improvement? (I seem to be seeing fewer bad focusing posts.)