You can combine the whole poem. Huannv and fishing boats are obviously related to water. They move on or near the water surface and have little to do with the state of the mountain. When Huannu came back, she crossed the bamboo forest and began to be related to mountains, but it was later on the time axis than "Empty Mountain and New Rain". The difference in time can also be seen from the word "Hou". Therefore, there is no contradiction between "Huannv", "Fishing Boat" and "Empty Mountain".