do you have the money for an upgrade now? do you feel like you know everything of the 40 and that it's holding you back?
I'd seriously consider waiting another year for technology to update. If you got something now, two years down the road the whole game could be completely different. New codec could come out, new line of efficient cameras, lenses, etc. Start to save up now so you can buy something REALLY dope later.