The woman said to him, "Sir, give me this water, so that I don't get thirsty, neither come all the way here to draw."

 Here we have not altered the order; but we must note that to take John 6:1-71 before John 5:1-47 does give an easier and more natural order of events. 