Try turning bluetooth off on your phone (you must go into settings app -> bluetooth, and not use the pull down in command center)
you need to be at home or somewhere with wifi
this forces the watch to use wifi to transfer the upgrade from the phone instead of bluetooth
mine was sitting at 18-20 hours for an hour or 2, once i disabled bluetooth it dropped quickly, and was done in 30-45 minutes.