I currently own 20D and need to upgrade. I am seriously thinking about the 5D as it has the bigger sensor.I am very frustrated with my 100mm f2.8 macro lens. being magnified using the 20D. I find it very frustrating when shooting portraits as I feel I am too far away from my subject. I also have the 17-40mm f.4L lens. I generally shoot portrait and photo journalism and would like to buy the 24-105mm f4 IS for more versatility. I am a very serious amateur. Would I be right to think that the EOS 5D would be the right body for me to buy along with the 24-105mm. If so I would rather wait for the upgrade as I feel it must be around the corner. Does anybody know when the new 5D may come out?