My Music is now pretty much restored, due to my friend's habit of grabbing any new songs I've got onto his laptop for his collection. Took us loads of time last night, but we managed to copy his music library back over to my new drive, and now I simply have to go through and delete anything too bad.
My Pictures on the other hand, still exists in my iPod somehow. I haven't dared reconnect it to the computer yet, in case it updates and wipes it. Does anyone know if there's a way to download the pictures from your iPod back to your computer? So far, I'm baffled.