While I do think that it was some poor planning, I think there is a reason for it. The reason I would suggest would be that they are all portrayed in their most moral and just form. Obi-Wan by that time had reached his ripe age, had patience and was very Jedi like. Same for Yoda. I would go as far to say that it is showing the characters in their most pure form of being Jedi.