I think you can request a "swap" or something. I don't know exactly how it works, but my regional Apple rep assured me that if you ask you can get a free upgrade within 14 days of shipping.
So yeah, that's my plan to get through March. If nothing is announced March 16th, then we'll order and that should take care of us in case they announce something before the end of the month. Heck, they may not ship for a week after I place the order, so that will get us into the first week of April.