It's not quite as bad as I thought, when I removed and reconnected the iPhone, all my pictures were there so I'm taking them off now using Image Capture. I'm also sucking the iPhone backup folder from the path linked above from midday today out of my Time Machine and will hopefully use that to restore to my iPhone 4S on Friday.
I think I'll wait a few days before I do the iPad!