It wasn't until the BBC got to the end and started again I found out I'd had an edited copy of Farpoint all that time. They had a weird feature length cut for the first broadcast, from the two part version. I can still just about spot what scenes seem newer. But as it was on a week after the flashbacks in All Good Things, it was and odd viewing the first time!
I did exactly that, watched All Good Things then Encounter at Farpoint - very confusing!
By the way, it looks like Syfy have fixed the episode description problem now - which annoyingly made today's recording fail, as it was The Battle, and TiVo thought yesterday was The Battle too.