40D upgrade.... which way to go, if at all?

You did a good job qualifying yourself in the initial post. The 40D is an awesome camera with files good up to 36 inch prints (I have an office full of jumbo 40D prints).

Consider upgrading your lenses - they'll have a bigger impact.

http://www.tomKphoto.com