Upgrade is when...???

Hey, i have a question for y'all. I do nt wish for people to tell me to do searches as i already have okay...anyway...

Alright, i am planning on buying a new Apple laptop for the begining of my next school year, which starts September, and before i take the dive i was wondering wether anybody knows when or if indeed an upgraded Macbook Pro is going to come out?

This is because i have heard that in around two months or so an upgraded version will be realeased and this is around September so...could you all please give me your comments and suggestions.

I probably wish to buy a Macbook Pro as i will need the hard drive for mass storage of my files/photos/music etc, the larger proccesser and dedicated graphics will also be good as i enjoy photography and frequently use software such as photoshop and Macromedia Fireworks. I also wish to play the occasional, may be it high powered game.
I also may occsionally use Garage Band.

My question is when do you think the upgrade will come out with the newer software and fixed issues?
I wish they made a smaller yet almost equally powerfull macbook pro as that would be the best solution ever as i may need to use my notebook in a limited space....

Any comment/suggestions would be highly appreciated.

Batman.