Unless you're shooting lots of action where the higher FPS and better AF in the 20D/30D will dominate your choice I'd go with the less-expensive body and better glass. Personally, I also vote for the used 20D and the optimum body choice (in fact, I'm in the process of trying to buy one myself as a 2nd body).
Cheers,
Geoff S.

