Replace 8700M GT with 8800M GTX or 9800M GTX?

[phoenix1972]

I'm looking to do some upgrades on my M1730 to before passing it along to my kids.

Here are the current specs for my Sapphire Blue XPS M1730:
Intel Core Duo Extreme X7900 @ 3.0GHz
4GB Ram - 2x2GB DDR2 667
Dual 8700M GT SLI
128MB AGEIA PhysX
200Gb HD
160Gb HD
8X DVD+/-RW DVD
Intel® PRO/Wireless 3945ABG WiFi Wireless
Win7 64bit


I've bought, or will in the near future, the following items:
Panasonic UJ 220 2x Blu-Ray BD DVD Burner (To replace the DVD)
128MB SAMSUNG 840 Pro Series SSD (Replace 160GB HD for the OS)
1TB Seagate SSHD (Replace 200GB HD)
8GB G.SKILL (2 x 4GB) DDR2 DDR2 800 (Upgrade memory from 4GB to 8GB)

 

I'm not sure what to replace the dual 8700M video cards with.  Should I go with the 8800M GTX or the 9800M GTX video card?

 

Not concerned about funds to either card is an option.  I've had zero problems with "The Beast" these last five years.  And since

I know the 8700M are on borrowed time (with the defective GPU) the video card upgrade will be enjoyed.

 

Also I'm not sure what, if anything, I can replace my current Intel 3945 WiFi Card with?  Can I go any newer then the Intel 4965/5100/5300?

My only complaint about them is that they are all draft-n wifi cards.

Comments/suggestions greatly appreciated!! Thanks