Proper order of the episodes?

I've noticed that there is some disagreement online regarding the order of the episodes.

For example, wikipedia lists "Jack and the Warrior Woman" to be episode 11, while most other sources say it is episode 6. This wiki even says it's the first time Aku appeared to Samurai Jack since he was sent to the future, which is obviously incorrect if it's episode 11.

There are other differences as well - wikipedia says "The Scotsman Saves Jack" are episode 3-4 of season 4, while other sources say they are episode 6 and 7.

Who is right? Could someone dig up their old dvds and tell us?