+1 for Macsales / OWC
I'd look into also getting their Mercury On the Go drive enclosure, so you can use your old 160Gig drive as a portable. I bought one when I upgraded my drive, and I love it - I have the FW800 version, it is quick, runs on bus power and is convenient. The USB Flash drives are so slow by comparison I only use the On the Go drive for shuttling files around.
Jim C