I wouldn't bet on any upgrades until September/October. That seems to be the preferred time for Apple, according to the Buyer's guide.And do you think there will be a refresh by the next three months?
I'm hoping for a small bump soon-ish (mainly to allow 8GB RAM in the 15"s as well as the 17"), and it wouldn't be unheard of, but I'm not postponing getting the 2.8 as soon as the decisions/paperwork at work is going through (unless the rumours of impending updates are extremely strong, when end if that's ready).