You are completely right. Since I'd only really begun work mapping out ANH, ESB and ROTJ I put in pretty much spur of the moment as placeholders and had a complete brain fart in remembering the differences. I feel like a total idiot. It's pretty early here and I'm writing these posts as I get ready for work so please forgive me for such a gross oversight.
I will include either the 2004 or 2011 versions of ESB and Jedi, or both 04 abd 11.