Whether the issue is your phone, Bluetooth, or the app itself, these quick fixes can usually get your Fitbit connected again ...

If I'm understanding you right you want to keep syncing media on the iPhone with the old machine, and just use iCloud on the work machine (and presuming you already use iCloud with the iPhone).