Front windscreen and rubber

[DAT392]

Hi I have had my 260z 2+2 1976 for over 20years 

and when the car was painted years ago the new windscreen and rubber was replaced and never really fit properly leaving gaps in the top corners.Also the scuttle tray has a gap between lower windshield rubber.am I missing something?As the car is getting some paint work done can any body please help with these issues.I’m going to replace the rubber and screen.Is there a difference between the 2+2 and coupe?Where is the best place to get a windshield rubber.Any help would be greatly appreciated.