The suggestion that these verses need to be reordered was made long ago. See, for example, S.R. Driver, An Introduction to the Literature of the Old Testament, 4th ed. (New York: Meridian, 1892), p. 346.