OK, looks like good news. I am now less than 29 days before the flight and I can still change the flight booked with the 30-day pass (so it is as previously assumed only the new flight/date that needs to be 30 or 7 days respectively away from the re-booking point, not the flight that's already booked ​​​​​​.