The fiberglass has sealed the leaks, had several rains with no problem. However, I am not sure if it was as a result of the repair, or the windshield and frame are now shifting, but cracks are appearing on the windshield on both sides now, not looking encouraging.
I have found some part numbers for the windshield frame, p/.n
12517625 frame and 10158989 upper. So far have not been able to locate or price any of these to see if it would be feasible to change out the whole frame, but again suspect not.