Q: Issues with iCloud and Photos (Mac + iPhone

So I've got a number of things going wrong at the moment, I'm pretty sure its just a few setting but I can seem to sort it out.

I'm using an iPhone 6s and a MacBook Pro, both up to date.

My iCloud photo storage docent seem to update across both devices whenever I make any changes or add/remove photos. I have photos on my iPhone that aren't on my Mac and vice versa, the albums on each of them are different and do not update automatically when any changes are made or when new photos are imported using the Photos app.

I've enabled iCloud Photo Library on both devices.

- On the Mac, under preferences, it states that there are 1,352 photos currently being uploaded, the progress bar remains empty however, with no progress being made.

- On the iPhone, under preferences, it states the there are 5,034 photos being uploaded, with no progress bar visible.

(There are in fact a total of 4,245 photos and 171 videos on the iPhone)

Both figures remain like this with no uploads being made, both devices are connected to a strong WiFi signal.

Any advice would be much appreciated.

Thank you in advance.