Do you have Expert Flyer? I'd set an alert for Z now and then as soon as you know that you can make the flight change it. Or once you arrive at the airport set the alert and make the change without even talking to the GA.