we are literally looking at about the same itinerary in March so thank you!! we are out of Waypoints as well, cannot wait!