Organization issues with iCloud Photo Sharing and iCloud Photos Library

The new release of Photos has resolve many organization issues for users of Aperture who migrate to Photos. My Aperture library contains 17000+ photos, the majority were scanned into the system ... date was not as key as story, title and manual sorting. The photos were organized by projects (decades) and albums for each year of the decade. Due to the improvements of the second release I was able to create the Photos library without losing the organization, metadata, photo description, etc. Each photo album is resorted by title. All the migrated photo albums show up in the Photos Library under iPhoto Events (decades) and the albums per year under each event.

I then decided to use iCloud. It took a week and a half for the building of the iCloud Library which does not accept the organization I used in Aperture and Photos. The design uses moments, collections and years to automatically organize photos and videos. This negates all the work I have done. I used the Time Machine to rebuild the Photos Library. I hope that Apple will continue to improve Photos and address this issue soon. I will not use icloud for the sharing of my photos. I'll wait for your improvements and / or wait for Zenfolio's new add on for Photos (works well with Aperture).

Tested the photo sharing capability. The organization of the album stayed the same. All looked good. One issue though: the photo description, faces information and some other metadata was not moved to iCloud. Is there a way to ensure that the photo metadata is made available in the shared album? or will you address this issue in the future? I have 17,366 Photos, 73 Videos, 28 Folders, 200 albums. Would the sharing of the 200 albums replace the need of the iCloud Library?