Look at the Pan/olymp MicroFourThirds offers.
Cheaper than canon and superior lenses for less bucks.
Lots of videos on youtube where the panasonic especially are close to equal to the 5D II.
In any case if you can wait till Photokina, do that.
Lot of companies are expected to bring out interesting products that will fit your use.
Whatever you do. Take a camera with you at all times.
OP