This is the way I read the Scriptures on this so-called Genesis 1 and Genesis 2 problem:
The first key is on the position of chapter mark. Chapter 2 is NOT put after the current 2:7. This is a very significant point in writing. It means whatever says in Genesis 1 is true, and should be taken as a major description of creation sequence, and it needs not to have any connection to the content of chapter 2.
Second, the whole chapter 2 is focus on the description of Eden and Eve. Verses 2:1 to 2:7 are used as an review or an introduction.
With the above two understandings. then whatever says in 2:1-7 should not be used to contradict what says in chapter 1. When we write a review or a summary, the actual sequence of content DO can be mixed in sequence.
Most importantly, I do not see any contradiction between 2:1-7 and chapter 1 in the sequence of creation. Verse 2:5 is the key. It only addresses plant and herb. And it does NOT say they were not there. They ARE there, but simply not grow up yet (due to no rain).
I really do not see what is the big surprise on this issue. The description attracts me the most is, in fact, that it says there are already seeds in the ground, but there were no rain. That is VERY interesting. Does anyone know the origin of plant on land? How did it come up from the ocean? I knows nothing about it. But I bet people do not know it either.