I'd stick with the Yangshuo plan if I were you. It shouldn't be super crowded on the weekend of the 26th and there aren't a lot of good nature options if you head east instead of west.