The best way to combine the two formats is to scan/digitise the hard copies and merge it with your existing soft copies. Do this before you start sorting and labelling photos.