Please enter the Bluetooth menu on your Galaxy S2 and make the device visible for unlimited time. Most likely this is the reason your old phone can't detect the new one to send files. There is another way to transfer files: through a miniSD card. Copy the files to the card then move the card to the new phone and that's it.
You can update the firmware using Samsung Kies application.