I've done a few multi-thousand photo transfers for people at work and I've found the "thumbnails" folder really screws up the process. Try connecting your old phone to PC, opening the DCIM folder, and transferring just the "Camera" folder to PC, then plug in the new phone and transfer it back.