making my 15" faster

I want to improve the speed of my 15" mbp. I do not play games. Mostly video edting, office, net.
I have the 2.4 with 667 memory, and 2gb ram, and 5400 rpm 200 gb hard drive.
Is my best option:
1. Sell and buy a new 15" top tier MBP with 7200 hard drive and top end processor (will cost me >$1000 net)
2. Increase my RAM to 4g ram and a OCZ vertex 120gb ssd as reviewed on bare feats, which will cost me about $400 total.

THXS