Hey buddy please get anti corrosion treatment done,from outside then if mechanic is not doing,will not cost you upward than 2000 bucks,and also get the floor painted in matte black color,mine was to painted,since than no rust on floor.If not full floor than get atleast front floor anti rust coated,
I think the matte black was some kind of anti rust though.
WINDSHIELD:Another thing try and fix the windshield first than later,cause you have changed the front show,which may cause some type of miss alignment and leakage issue