Which ever path you choose, Murphy's Law tells you that you will have to file an amended return.
submit form 4868, estimate generously for tax due, and file only after you get the corrected W-2C and see what your employer really did, not what they say they will do..
They may still mess it up.
