I am in a similar position of wanting a new camera. I am shooting with a 30D, and have been thinking about moving to a 5D MkII for shooting weddings, portraaits and some landscapes. The problem is I need 2 of them, and I don't have the money at present. I would also want more lenses.
My solution as of today is to continue using my 30D for personal photos, and hire 2 camera bodies when required for paid jobs. The cost will be absorbed into my fees (it will eat into profits a bit). Instead of buying bodies, I will build my lens collection, and then when I can afford to, I will buy the best 2 bodies for my needs that are available - probably in about 18 months.
I prefer prime lenses, however at present I only have one, the 50 1.4 along with 17-40 f4L and 70-200 f2.8L IS zooms.
My plan is to eventually collect all canon L primes from 24 to 135mm as well as 100 f2.8 macro and zeiss 21 f2 and 28 f2.
When I have the zeiss 21, and the canon 35, 85 and 135 L's and 100macro, then I will buy bodies. The other lenses will come later.