I believe that the two halves of the macros - regular and shared - can be uploaded and downloaded separately. One of the sides should not conflict with cross hotbar settings. Also you should be able to copy all of your macros to the non shared side so that downloading the client settings doesn't erase them. Then you can update the shared side and upload it. Or vice versa.