I am in a similar situation: stuck on 'uploading' photos on my iPad although my phone has synced them ok. On checking the photos on the iCloud Photos app, a pic I just took on my phone is already there, zilch from the one I took on my iPad.
Hope this resolves itself, not a happy bunny at the moment