I upgraded my Mark 2 this weekend as well, and I have one thing to add:

Don't use Fujitsu 18 gig drives. It works okay, but it's really loud. When the music is quiet, I can hear the drive spinning, something I was never able to do with the factory drives.