MacBook-MacBook Pro trade-off

Hey guys!
(almost typed hai guise )

Okay, long story short:

a former co-worker and I i considering switching laptops... He's getting a new one from his work number 2, and his GF is getting a new one from his job, and his mom needs a new lappy (this is where my MacBook comes in).

I have a late 2007 MacBook with these specs:
2.16 Core 2 Duo
120 GB HDD
3 GB Ram
Battery still at full capacity!
(actually, battery capacity has gone UP a bit )

His MacBook Pro is:
15"
Early 2006
1.83 Core Duo
160 GB HDD
1 GB ram
ATI X1600 128 MB graphics
VERY poor battery! Lasts like, 20 mins
(extra bonus question: what battery do I need for this model? Ive googled like forever but come up empty handed)

Sho ld i switch with him? Will i see any significally boost in terms of graphics performance?
(i mainly use my MacBook for Illustrator, Photoshop, iTunes and World Of Warcraft)

Cheers, Frederik
(sorry, for any typo's and grammar errors... My wirtten english is not what it used to be)

I would think twice about making that trade... What if you're not satisfied.
I bet your friend isn't gonna trade you back.

You're gonna have to sell it for a lot less than you'd get for the MacBook.

Just something to think about.

Well... You're totally right on that note... Hmm, but the again, its only gonna be temporary, as im saving up for a iMac or Mac Pro

Pros for the trade:
Backlit keyboard
Getter graphics
15" screen
Brighter screen
More HDD space

Cons:
Have to spend $$$ on a new battery
Less ram
Older