My advice: First of all forget about the macbook air, that 128G HD will fill up faster than you realize and you will not be able to upgrade it. I'm also in the position of upgrading my 2007 macbook and I'm looking at the entry level 13inch Macbook Pro, I cant afford the retina, if you can then go for it. [although the cheaper 13inch is due soon]
With regards to the camera, If you upgrade, you imac should be fine. Like I stated, I have a 2007 macbook and It handles 5D mkii files quite well. Your I mac should be more powerful than my macbook.
As for what to upgrade first, I'm unsure. How big a problem is getting the pictures to your mac then emailing the finished photos to your clients? The errors on the camera are worrying, may be time to upgrade. I'v taken some great gig shots with my 40d, you just have to hope the venue has powerful spotlights and wait for those to illuminate the subjects. But in situations where there is one or two weak lights then not even full frame will help. [Maybe 1dx tho ]
Good point with the storage size Sith Zombie and also about the upcomming 13"pro... maybe I should wait for that.
Regarding the Camera issue, the errors are a pain in the a** when they happen. I've also taken some nice gig shots with my 40D, specially with flash. But the venue I shoot for is very dark and illumination is quite often kept down, so I often end up with too many not usable files...