I have the same bloody problem on my 950xl. This is what I did:
1) after the phone restore (the first time I switched it on and connected to my live account), I opened whatsapp to see if all the messages where there. I was wrong, so I went back to my old phone and made anew backup from whatsapp...