Properly restore photos to Lumia 1020

[WPCentral Question]

I have just reinstalled the firmware on my 1020 in order to get Cyan (I was on 8.1 Dev Prev) and am now busy restoring everything. I had about 7GBs worth of photos on it, all of which is now on OneDrive. Downloading 7GB will take me days though so I made an offline copy of the entire Pictures directory on my PC. Everything seems to have copied nicely to my PC with date and EXIF info etc. My problem now is that simply copying this folder back does not seem to work properly as all the info like dates are then lost once they reach the phone, this means that my photos are now not properly organized and I cannot open high res images with Nokia Camera anymore. Is there any way that I can copy the images back to my phone properly without having to download them from OneDrive?

PS. My PC is running Windows 8.1 Pro.