Benique, if I've read correctly, here are the nuts and bolts of what you've described of your needs, followed by my opinions:
> You mostly shoot at F5.6 - 11.
This, to me, means spending big money on wide aperture lenses is a waste for the majority of your work. If you're stopping down to F8, or something, the advantage of an F1.2 or an F2.8 lens is lost. That's good news because it could save you a LOT of money.
> You shoot in somewhat limited space. Without exactly defining what that is, it's hard to know what the limits are going to be for focal length. Some have said a 70-200MM is wholly inappropriate, but then they recommend an 85. If your space isn't too tight for 85MM, then the 70-85 end of a 70-200MM will work, too.
> You currently shoot a crop body but have plans to upgrade to full frame in a year or so. This plan, to me, means don't let the crop factor affect your choice. You'll likely have the lens far longer than any body.
When I add this all up, I like MackGuyver's suggestion of the 70-200MM F4 IS more and more (I also happen to have and love that particular lens...for portraits...on a crop body). The zoom ring is so smooth and can turn with a single finger. It has excellent sharpness, great flexibility with the zoom, is much smaller and lighter than the F2.8 version and has a relatively friendly price (especially with rebate).
If it was me, I'd be choosing the 70-200MM F4 IS. If you can fit an 85MM, then you can use a 70-200. The move to full frame will only improve its usefulness in limited space.