Well, what softwares do you use on your laptop? If it is those basic office softwares, getting a Macbook is an overkill, in which you can just get a normal intel/AMD based laptop, throw in OpenOffice for office applicaions, you'll still spend only 1/3 of a Macbook. The rest you can just reward yourself with other stuffs like upgrading more memory, bigger harddisk (maybe go with 320GB).

I;m not downplaying Macbook as I'm using 1 myself and Windows. Each served different purposes as I used my Macbook for my emails (though some weird thing about having tons of emails in a folder won't download new ones until I moved them away) and at times, photoshop.

But I use my Hp laptop for programming, office works, audio encoding, backup/restore my mobile contacts (I'm using different brands, thus seperate the backups instead of 1 main backups).

But if you wait for a newer models, then you'll have to wait always, as new models always comes out with better specs. You need it, you should just get it, unless it's not vital to get it now/soon.