Well it's either that or switch it back, because it won't make sense any other way. I mean even if I switched the scene with chewie around how is that scene supposed to work without threepio?

This might be a problem. Sure it works fine as far as flow and feel, but moving the yoda scene ahead causes problems I can't think of solutions to. I mean I'm sure it's possible to edit 3p0 out of the scene with chewie but the results would be so choppy it would ruin it. I think it might have to stay as it is.