I'm in that boat too! Am leaning towards waiting, at this point...
I do wish they'd hurry up.
Waiting really sucks, but the reason i am waiting is because i am hoping they come out with some really nice stuff. -- a newer and better macbook would be great - and if they just had the aluminum casing like the MBP (i'm guessing they will add this on as they have been swaying towards this considering the Air and the MBP) it would eliminate the fact that many people diss it by calling it a "crackbook" and aluminum would help it run slightly cooler by absorbing and dissipating heat.
Some of the things i would like to see in a new MB:
1. Aluminum casing AND Backlit Keyboard similar to the MBA - but this is assuming that the keys are the SAME color as the casing -- cuz the MBA looks ugly cuz of discolored keys... =(
2. 7200 RPM Drive Option for 200/250GB [many base laptops have this]
3. Intel's NEW 180GB Solid State Disk!!! [this was released for Intel at the same price of a 32 GB SSD -- about $450]
4. Faster Processor --> atleast 2.8 Ghz Core2Duo - MAYBE an option for a Mobile Quadcore processor(not likely at all)
5. Better Graphics -- atleast Intel GMA X4500 - which actually benches close to the Ge Force 8400 -- but i prefer to have a dedicated card - cuz i play CASUAL games -- if not then atleast put a Mobile ATI card or something.
6. Up to 6GB of RAM -- atleast -- i need more than 4 GB Because i use REALLY ram intensive apps in Vista (but not graphics intensive - cuz then i would buy a MBP)
7. Support for 64 Bit versions of Vista (with drivers on the OS X DVD that you get!)
8. Price Cuts!!!! - BIG Price Cuts!!!!
9. 802.16 Wireless Infrastructure - a friend of mine is developing this and its not for the public - but compared to wireless N - you get about 12 times the Range and 4 times the speed of N - which is 20 Times the speed of g (N is 5x G)
so here's to Apple

and PLEASE steve Jobs - we LOVE your ideas, but listen to us and make a better Macbook!!!!!
if all this came out for the MB then i would buy it because it would be the laptop of my dreams
