As a note, any time less than about a week out there's a very good chance of a ~$50ish change fee being applied (this is 2nd hand info btw) which is rarely waived even if upgrading the package. So, you may not want to wait until the very last minute for that.