That's my theory, too. Plus the fact Dooku chopped off his part of his arm, aka Luke/Vader in TESB. And Part III will mirror VI only with Anikan doing what Luke didn't at the end. The rest of what you said I had a differing opinion on.
Just saw some Special Features -- I so marked out at the Sneak Peek section with Ani and Obi One fighting.
Having completed some Marketing/Advertising classes in college, I always get a kick out of the old trailers/teasers -- man were they cheesy. It's also amusing to look for scenes in the trailer that were cut from the movie -- I think I saw one that featured C3PO tearing something off a wall.
Also I laughed at the pimping of Lando in the trailers -- it was like "See, now we have a black guy in on it!"
One thing I chuckled at as well is that in A New Hope, when C3PO says "Thank the Maker" when getting that oil bath he's talking about Darth Vader.
And finally, I watched episodes I and II over the past few days, and it was a shame that Darth Maul wasn't fleshed out more. I was really disappointed with how little time he got. And for all the faults Episode I had, I did like the final saber fight between Obi/Maul/and that other guy whose name I can't spell...