John, you have plenty of time available as yet. It's quite possible that this much awaited (and long promised) 30 day visa waiver programme may be in force then.