I suggest making the Tidy option smarter when it comes to organizing Artboards. The tool could work better if you add some logic to arrange Artboards by keeping artboards in the same context. Please take a look at the Tidy and Artboard Tricks Plugin.