Should I upgrade or wait (for 32nm)?

So, I'm debating replacing my laptop, and I'm wondering how much of an upgrade this would be. I plan on using it for general web surfing, mobile video watching and some light gaming (WoW on medium-high settings, and some strategy games from Civ4 onwards) I know that there's going to be a huge increase in portability and battery life, but I wonder about performance.

Old Laptop: HP Pavilion ZV6000
AMD Athlon 3200+ (K8, OC'd to 2.31ghz)
ATi 200m (26% OC)
1GB DDR 333 RAM

New Laptop: HP DM3
Amd Athlon Neo x2 335 (1.6ghz)
ATi 3200HD
4GB DDR2 RAM

How much of an upgrade will this be? will it meet my needs? and Finally, My desktop is a Kuma 7750, and I've got a 3200HD on my Mobo. If I pull my GPU and underclock to 1.6ghz, would that be a reasonable approximation of the performance to expect from the laptop?

Well, I Know the 3200 is better than my old 200m, but from what i've read the 200m was a mid level discrete card that a die shrink (to 130nm!) allowed them to integrate. I think the 3200 has followed the same basic strategy, so it's almost the same class, but newer

Also, from my understanding the Neo is basically just a K8 (like my old laptop) but made on 45nm and clocked low to improve battery life. Because of this, does anyone see any issues with me underclocking my K10 Kuma to simulate the laptop's performance?