Unfortunately I have no old ones I can re use. Spoke to East Kent trim this morning. These trim surrounds and clips are indeed going to be remanufactured but the process could take some time.
I'm gonna keep searching but if I find nothing before the car returns from paint I'm gonna replace the glass using the same profile rubber seal used for the rear screen and replace the trim when they become available.