Edison, please narrow your OSM building shaped down and match exactly the aerial imagery.
Try to square out the shapes as well.
I'm going to delete some of your building shapes - they are far to big and not detailled enough.

Thanks.