I think, all along, if Rory could choose, they would not be on the TARDIS anymore. Amy has other plans. I remember hearing that they had not been signed for next season. Still the case? They could be artfully building the exit strategy with this episode.