The production order vs. aired order vs. DVD order thing is pretty tricky in a lot of fandoms! There's one episode in season five of White Collar that was, I think, filmed as the second or third of the season, and originally supposed to go there, but got moved to, I think, episode five or six -- and is obviously out of continuity there (in terms of the way the characters relate to each other; and also, the previous/following episodes are clearly supposed to happen without a break between them), but would've been out of continuity as 5x02 or 03, also, because the plot relies on some stuff that happens later! It's a very cute episode that literally doesn't feel in continuity ANYWHERE in the season it happens in.

In the end I guess all we can do is pick the order that works the best for us, and try to work with that. XD