I have been back to the panel beater and yep it needs to be resprayed. Roof is going to be stripped right back and resprayed, down the a pillars and the rear quarters. Whilst they have the car I am having all plastic components repsrayed (grille, N1 kit, mirrors, tail lights etc).
Job will be done properly and all glass will come out. The great thing about it is the windscreen guy they use is going to use a generic rubber over the edges and over the front and rear windscreens rather then me forking out $800 for the original trim kits. The screens will be removed, reinstalled and custom rubber install done for <$500
Will be done in the next few months..