Photos stopped uploading to iCloud Photo library

I recently have started having issues where photos on my iPhone 6 (iOS 8.4.1) have stopped uploading to iCloud photo library. It is stuck on "Preparing 5,393 items". Background battery usage is at 37% for Photos. I have tried the following which hasn't worked:

1. turn off iCloud photo library. remove or http://forums.imore.com/ask-question/331378-photos-ios-stuck-uploading-icloud-ph oto-library.htmldownload photos depending on which ones are already saved on your other devices.

2. forget your home network (setting->wifi->choose home network->"forget this network"

3. turn off wifi

4. power device of and then turn back on.

5. connect to wifi (home network)

6. turn on iCloud photo library

Has anyone found a solution that actually works? Very frustrating!