Cycle canton got back to me and they think it should be fine leaving the tour at 5pm and getting back to the airport on a Sunday eve by 6pm. We'll see. I'm more comfortable taking the train since it operates on a predictable schedule rather than a taxi which can encounter traffic jams etc.