Might also be worth using a very long (1 week - 1 month?) TTL for your DNS MX records. This is no guarantee but it should buy you some extra time over the default which could be only an hour or so.