I agree with that, given what we've seen so far. The producers have never been shy about letting their fanboy flags fly.
And, yeah, I agree that the producers probably knew back around Season 2 that parallel universes were going to play a big part of the ending. My comment about 2007 was directed more at the idea that, until they had an end date, they had to throw in various other (unplanned) stuff in order to stretch things out and account for unexpected stuff (like the problems with some of the actors [Eko, Ana Lucia, Libby, Rousseau and even Desmond], the unexpected popularity of Ben and a writers' strike).