What's the vignetting issue? EF-S mount lenses won't fit on film camera EF mounts. You should stick with EF mount lenses for your purposes. L-lenses are nice but not required for your purpose.
Canon AF bodies range widely, and depending on what you want to do, optimal bodies vary a lot. I have Elan 7E and it's a nice camera, but this is actually a pretty poor choice for what I want to do. Generally speaking, recent EOS bodies using C-MOS AF sensors perform poorly in low light situations, and for those applications you better stick with Multi-BASIS AF sensor bodies. However, if you shoot only in bright lighting, modern bodies may give you faster and better AF performance. I personally find older bodies like 620, 1N, 10, 5, etc. are better since I shoot more in low light situation. There are other factors that you should consider. For example, 10 has no vertical grip you can use. 5 has a dial that is prone to break. 600 series and 10 are prone to shutter problems. Etc., etc.