Korg X50 Editor/PCG arrangement problems

[WindriderMetal]

I'm currently playing the X50 on a tour, and every night I have to rearrange the setlist. However, I am unable to do any rearranging of patches within the X50 editor; I would have thought that it would be possible to just drag and drop combis and programs around, but the only way is to manually save them in different places using the Utility menu, and this is far too time consuming.

I used to play a KARMA so I still have the PCG file from that, and I can rearrange the combis in that original PCG using LeLibby... but if I import the PCG into the X50 and export it again as a new PCG in order to rearrange in LeLibby, it sounds funky when imported BACK into the X50, because programs/samples are in the wrong places.

Is there really no fast way to rearrange multiple patches in the X50 editor?
And if I do have to continue using PCG files and LeLibby, how can I stop the sounds messing up between the export and import?

Thanks!