leumas: I beg to differ my friend. Organic chemistry is not that crucial, maybe if your into polymers and plastics, but not if you're into more hard/condensed materials.
gmunoz: I would get as much experience doing computational work. It's a much needed skill in both academia and corporations. Also, doing computational quantum and physical chemistry is probably a good breadwinner. Learn to program, preferably matlab/C/fortran. And, do as much physics you can. Not just some mechanics and some steppingstone - physics, but real physics like solid state physics, quantum mechanics and the like. I think it would be easier to land a R&D job that way.
Besides, general chemistry? come on guys! That is like playstuff for a real chemist. I don't really think you have that much need of a gen chem course in corporate life? Although if that is the only chem you're using in the companies where you work I don't think they're doing very well... gen chem is only a stepping stone on the chemical ladder.