Those wheels on the M3 look great! Sorry to hear the shop didn't work out- that happens to me any time I don't do something myself. There are a few speciality shops out here that I tried to get in touch with for BMW welding work and they wanted what ended up being $200 per 4" mig bead. I bet they'd fix your top and charge you $8K
As per the E30, exterior-wise you need to get some all black trim (may be able to help you out w that), get rid of that pfeba spoiler for an iS spoiler, get some euro grills, and some IE3 Springs w/ Konis and E90 drop hats (the best affordable suspension setup).
Are you going to do a bushing refresh while you're in there? I can give you the run down on what to get for cheap+best for performance (hint, febi OEM rubber in the rear + M3 offset control arm bushings+lemfoerder control arms, E36 steering rack).
Also, what's the final drive like on the trans you're using? Pretty steep?