I do plan on watching The Girl Who Waited again when I have a spare hour. But yeah, this week's episode was a big step back up. Top 3 this year and top 10th ever out of what I've seen. Toby Whithouse is probably the show's best regular writer besides Moffat himself imo
Karen Gillan has said she has signed on for season 7, and filming of the Christmas special going on this week has shown both Karen and Arthur Darvill on set. Amy might be back as a full time companion next season but I think Rory just might show up once in a while.